From: <var...@us...> - 2014-12-01 13:45:22
|
Revision: 9394 http://sourceforge.net/p/phpwiki/code/9394 Author: vargenau Date: 2014-12-01 13:45:20 +0000 (Mon, 01 Dec 2014) Log Message: ----------- Comment out unreachable code Modified Paths: -------------- trunk/configurator.php trunk/lib/WikiDB/backend/ADODB_postgres7.php trunk/lib/WikiDB/backend/PearDB_pgsql.php trunk/lib/WikiUser/HttpAuth.php trunk/lib/WikiUser/IMAP.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-12-01 13:41:58 UTC (rev 9393) +++ trunk/configurator.php 2014-12-01 13:45:20 UTC (rev 9394) @@ -1697,6 +1697,7 @@ function _config_format($value) { return ''; + /* $v = $this->get_config_item_name(); // handle arrays: a|b --> a['b'] if (strpos($v, '|')) { @@ -1706,6 +1707,7 @@ if (preg_match("/[\"']/", $value)) $value = '"' . $value . '"'; return sprintf("%s = \"%s\"", $v, $value); + */ } function get_config_item_name() Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2014-12-01 13:41:58 UTC (rev 9393) +++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2014-12-01 13:45:20 UTC (rev 9394) @@ -39,10 +39,12 @@ { return 0; // if the wikiuser is not the table owner + /* foreach ($this->_table_names as $table) { $this->_dbh->Execute("VACUUM ANALYZE $table"); } return 1; + */ } // just for blobs. the rest is escaped with qstr() Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2014-12-01 13:41:58 UTC (rev 9393) +++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2014-12-01 13:45:20 UTC (rev 9394) @@ -53,10 +53,12 @@ { return 0; // if the wikiuser is not the table owner + /* foreach ($this->_table_names as $table) { $this->_dbh->query("VACUUM ANALYZE $table"); } return 1; + */ } function _quote($s) @@ -329,7 +331,7 @@ return $word; // clause specified above. - return $this->_pagename_match_clause($node) . " OR idxFTI @@ to_tsquery('$word')"; + // return $this->_pagename_match_clause($node) . " OR idxFTI @@ to_tsquery('$word')"; } } Modified: trunk/lib/WikiUser/HttpAuth.php =================================================================== --- trunk/lib/WikiUser/HttpAuth.php 2014-12-01 13:41:58 UTC (rev 9393) +++ trunk/lib/WikiUser/HttpAuth.php 2014-12-01 13:45:20 UTC (rev 9394) @@ -58,6 +58,7 @@ { return false; + /* header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"'); header("Authorization: Basic " . base64_encode($userid . ":" . $passwd)); if (!isset($_SERVER)) @@ -66,6 +67,7 @@ $_SERVER['PHP_AUTH_USER'] = $userid; $_SERVER['PHP_AUTH_PW'] = $passwd; //$GLOBALS['request']->setStatus(200); + */ } function logout() Modified: trunk/lib/WikiUser/IMAP.php =================================================================== --- trunk/lib/WikiUser/IMAP.php 2014-12-01 13:41:58 UTC (rev 9393) +++ trunk/lib/WikiUser/IMAP.php 2014-12-01 13:45:20 UTC (rev 9394) @@ -64,12 +64,14 @@ { return true; + /* if ($this->checkPass($this->_prefs->get('passwd'))) { if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this) . "::userExists => true (pass ok)", E_USER_WARNING); return true; } if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this) . "::userExists => false (pass wrong)", E_USER_WARNING); return $this->_tryNextUser(); + */ } function mayChangePass() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-01 14:02:13
|
Revision: 9395 http://sourceforge.net/p/phpwiki/code/9395 Author: vargenau Date: 2014-12-01 14:02:03 +0000 (Mon, 01 Dec 2014) Log Message: ----------- Spelling Modified Paths: -------------- trunk/UPGRADING trunk/configurator.php trunk/doc/INSTALL.mSQL trunk/doc/INSTALL.mysql trunk/doc/README.phpwiki-auth trunk/doc/THEMES trunk/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FMagicPhpWikiURLs trunk/pgsrc/ReleaseNotes trunk/themes/MonoBook/templates/info.tmpl trunk/themes/default/templates/info.tmpl trunk/wiki Modified: trunk/UPGRADING =================================================================== --- trunk/UPGRADING 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/UPGRADING 2014-12-01 14:02:03 UTC (rev 9395) @@ -66,7 +66,7 @@ your HomePage url and press "Enter", which will add all fresh pages from pgsrc to your pageset. If you deleted some pages on purpose, you'll have to removed -them again with PhpWikiAdminisstration/Remove then. +them again with PhpWikiAdministration/Remove then. There's no smart "Merge Diffs" yet to upgrade existing docs, this will come with the next release. Also upgrading the Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/configurator.php 2014-12-01 14:02:03 UTC (rev 9395) @@ -586,7 +586,7 @@ <dt>LOOSE</dt> <dd>Cached pages will be invalidated whenever they are edited, or, if the pages include plugins, when the plugin output could - concievably have changed. + conceivably have changed. <p>Behavior should be much like STRICT, except that sometimes wikilinks will show up as undefined (with the question mark) when in fact they refer to (recently) created pages. @@ -600,7 +600,7 @@ page, etc...</p> <p>This setting is generally not advisable, however it may be useful in certain cases (e.g. if your wiki gets lots of page views, - and few edits by knowledgable people who won't freak over the quirks.)</p> + and few edits by knowledgeable people who won't freak over the quirks.)</p> </dd> </dl> The default is currently LOOSE."); Modified: trunk/doc/INSTALL.mSQL =================================================================== --- trunk/doc/INSTALL.mSQL 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/doc/INSTALL.mSQL 2014-12-01 14:02:03 UTC (rev 9395) @@ -17,7 +17,7 @@ http://www.hughes.com.au/ for information on downloading and instructions. -Create the database. You might need system privledges to do this: +Create the database. You might need system privileges to do this: [root@localhost phpwiki]# msqladmin create wiki Database "wiki" created. Modified: trunk/doc/INSTALL.mysql =================================================================== --- trunk/doc/INSTALL.mysql 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/doc/INSTALL.mysql 2014-12-01 14:02:03 UTC (rev 9395) @@ -73,7 +73,7 @@ Or you can run ?action=upgrade (also from "Upgrade" at PhpWikiAdministration), but then your database user needs the necessary ALTER and CREATE permissions. -You might want to set DBADMIN_USER temporarly in your config.ini. +You might want to set DBADMIN_USER temporarily in your config.ini. ?action=upgrade also brings all changed pgsrc files up-to-date. /Reini Urban and Arno aho...@ma... Modified: trunk/doc/README.phpwiki-auth =================================================================== --- trunk/doc/README.phpwiki-auth 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/doc/README.phpwiki-auth 2014-12-01 14:02:03 UTC (rev 9395) @@ -76,7 +76,7 @@ ! ALLOW_USER_PASSWORDS -True User Authentification is used with Bogo Login and not-empty +True User Authentication is used with Bogo Login and not-empty passwords or ALLOW_USER_PASSWORDS = true. To require user passwords set Modified: trunk/doc/THEMES =================================================================== --- trunk/doc/THEMES 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/doc/THEMES 2014-12-01 14:02:03 UTC (rev 9395) @@ -29,7 +29,7 @@ Other file extensions are reserved for future use (i.e. .tpl for Smarty or .html for our old template expansion.) -Only one template is called, ususally the "html.tmpl" template, +Only one template is called, usually the "html.tmpl" template, which includes all other templates then. WikiTheme templates are regular xhtml, but the php parts within "<?php" and "?>" Modified: trunk/pgsrc/Help%2FHelloWorldPlugin =================================================================== --- trunk/pgsrc/Help%2FHelloWorldPlugin 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/pgsrc/Help%2FHelloWorldPlugin 2014-12-01 14:02:03 UTC (rev 9395) @@ -17,7 +17,7 @@ }}} ---- -~PhpWiki's plugin architecture allows you to add custom page elements to your wiki. All you have to do is extend (subclass) the ~WikiPlugin class and create your output via the run() method, dependend on the Wiki- or Request arguments, +~PhpWiki's plugin architecture allows you to add custom page elements to your wiki. All you have to do is extend (subclass) the ~WikiPlugin class and create your output via the run() method, dependent on the Wiki- or Request arguments, * either with the predefined HTML classes to create valid XHTML, * or by using templates, which are easier customizable, but generally more a mess to use and easier to create invalid XHTML. Modified: trunk/pgsrc/Help%2FMagicPhpWikiURLs =================================================================== --- trunk/pgsrc/Help%2FMagicPhpWikiURLs 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/pgsrc/Help%2FMagicPhpWikiURLs 2014-12-01 14:02:03 UTC (rev 9395) @@ -59,7 +59,7 @@ will generate a link which will take you directly to editing the SandBox, like so: [Edit the SandBox | phpwiki:SandBox?action=edit]. -Other possibilites: +Other possibilities: * [ Diff the SandBox | phpwiki:SandBox?action=diff ], * [ Lock the HomePage | phpwiki:HomePage?action=lock ], * [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ], Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/pgsrc/ReleaseNotes 2014-12-01 14:02:03 UTC (rev 9395) @@ -835,7 +835,7 @@ == 1.3.8 Jan-Apr 2004, Reini Urban == -External plugable authentification, DB prefs and sessions, +External plugable authentication, DB prefs and sessions, some more fixes, docs, themes and plugins. * new ~WikiUserNew class (started by Carsten Klapp), Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/themes/MonoBook/templates/info.tmpl 2014-12-01 14:02:03 UTC (rev 9395) @@ -1,6 +1,6 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); -$modifed = $WikiTheme->formatDateTime($revision->get('mtime')); +$modified = $WikiTheme->formatDateTime($revision->get('mtime')); $author = $revision->get('author'); global $WikiNameRegexp; @@ -96,7 +96,7 @@ <tr> <td class="align-right nowrap pageinfo"><?php echo $label['date'] ?></td> - <td><?php echo $modifed ?><?php echo $minor_flag ?></td> + <td><?php echo $modified ?><?php echo $minor_flag ?></td> </tr> <tr> <td class="align-right pageinfo"><?php echo $label['author'] ?></td> Modified: trunk/themes/default/templates/info.tmpl =================================================================== --- trunk/themes/default/templates/info.tmpl 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/themes/default/templates/info.tmpl 2014-12-01 14:02:03 UTC (rev 9395) @@ -1,6 +1,6 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); -$modifed = $WikiTheme->formatDateTime($revision->get('mtime')); +$modified = $WikiTheme->formatDateTime($revision->get('mtime')); $dbi = $request->getDbh(); $author = $revision->get('author'); @@ -82,7 +82,7 @@ <tr> <td class="align-right nowrap pageinfo"><?php echo $label['date'] ?></td> - <td><?php echo $modifed ?><?php echo $minor_flag ?></td> + <td><?php echo $modified ?><?php echo $minor_flag ?></td> </tr> <tr> <td class="align-right pageinfo"><?php echo $label['author'] ?></td> Modified: trunk/wiki =================================================================== --- trunk/wiki 2014-12-01 13:45:20 UTC (rev 9394) +++ trunk/wiki 2014-12-01 14:02:03 UTC (rev 9395) @@ -5,7 +5,7 @@ Also For Wiki farms. Simplifies USE_PATH_INFO paths: "/<home>/wiki/HomePage" instead of "/<home>/wiki/index.php/HomePage" -The simpliest version is +The simplest version is <?php include "index.php"; include "lib/main.php"; ?> Note: This needs a webserver handler to PHP like this on Apache: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-03 16:15:40
|
Revision: 9413 http://sourceforge.net/p/phpwiki/code/9413 Author: vargenau Date: 2014-12-03 16:15:36 +0000 (Wed, 03 Dec 2014) Log Message: ----------- Better error message for limit Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiDB/backend.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/PageList.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -1512,7 +1512,7 @@ if (is_array($limit)) { list($from, $count) = $limit; if ((!empty($from) && !is_numeric($from)) or (!empty($count) && !is_numeric($count))) { - trigger_error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } return $limit; @@ -1520,13 +1520,13 @@ if (strstr($limit, ',')) { list($from, $limit) = explode(',', $limit); if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) { - trigger_error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } return array($from, $limit); } else { if (!empty($limit) && !is_numeric($limit)) { - trigger_error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } return array(0, $limit); Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/WikiDB/backend.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -554,13 +554,13 @@ if (strstr($limit, ',')) { list($from, $limit) = explode(',', $limit); if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) { - trigger_error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } return array($from, $limit); } else { if (!empty($limit) && !is_numeric($limit)) { - trigger_error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } return array(0, $limit); Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/AllPages.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -66,7 +66,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if (empty($args['sortby'])) { Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/AllUsers.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -70,7 +70,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } extract($args); Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/BackLinks.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -61,7 +61,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } extract($args); Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/IncludePages.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -57,7 +57,7 @@ if (isset($args['limit']) && !limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } $html = HTML(); Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/LinkDatabase.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -103,7 +103,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } $caption = _("All pages with all links in this wiki (%d total):"); Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/ListSubpages.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -66,7 +66,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if ($args['basepage']) Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/MostPopular.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -66,7 +66,7 @@ if (isset($limit) && !is_limit($limit)) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if (strstr($sortby, 'mtime')) { return HTML::p(array('class' => "error"), Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/OrphanedPages.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -64,7 +64,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } extract($args); Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/PageHistory.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -343,7 +343,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::div(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } $pagename = $args['page']; Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/PopularNearby.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -67,7 +67,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::div(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } extract($args); Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/TitleSearch.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -80,7 +80,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if (empty($args['s'])) { Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/WantedPages.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -71,7 +71,7 @@ if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if (!empty($args['exclude_from'])) Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/lib/plugin/WantedPagesOld.php 2014-12-03 16:15:36 UTC (rev 9413) @@ -63,7 +63,7 @@ if (isset($limit) && !is_limit($limit)) { return HTML::p(array('class' => "error"), - _("Illegal 'limit' argument: must be numeric")); + _("Illegal “limit” argument: must be an integer or two integers separated by comma")); } if ($exclude) { Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/de.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -1122,7 +1122,9 @@ msgid "minor" msgstr "kleinere" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/es.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1103,7 +1103,9 @@ msgid "minor" msgstr "de menor importancia" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/fr.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -1103,8 +1103,12 @@ msgid "minor" msgstr "mineur" -msgid "Illegal 'limit' argument: must be numeric" -msgstr "Valeur illégale pour l'argument 'limit' : ce doit être un nombre" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" +msgstr "" +"Valeur illégale pour l'argument « limit » : ce doit être un entier ou deux " +"entiers séparés par une virgule" msgid "Rename" msgstr "Renommer" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/it.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -1087,7 +1087,9 @@ msgid "minor" msgstr "" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/ja.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1087,7 +1087,9 @@ msgid "minor" msgstr "" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" #, fuzzy Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/nl.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -1078,7 +1078,9 @@ msgid "minor" msgstr "" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/phpwiki.pot 2014-12-03 16:15:36 UTC (rev 9413) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1072,7 +1072,9 @@ msgid "minor" msgstr "" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/sv.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1073,7 +1073,9 @@ msgid "minor" msgstr "" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-12-03 15:32:04 UTC (rev 9412) +++ trunk/locale/po/zh.po 2014-12-03 16:15:36 UTC (rev 9413) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-25 17:59+0100\n" +"POT-Creation-Date: 2014-12-03 17:13+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1119,7 +1119,9 @@ msgid "minor" msgstr "次要" -msgid "Illegal 'limit' argument: must be numeric" +msgid "" +"Illegal “limit” argument: must be an integer or two integers separated by " +"comma" msgstr "" msgid "Rename" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-05 13:24:47
|
Revision: 9423 http://sourceforge.net/p/phpwiki/code/9423 Author: vargenau Date: 2014-12-05 13:24:38 +0000 (Fri, 05 Dec 2014) Log Message: ----------- Better tooltip for columns sorting Modified Paths: -------------- trunk/lib/PageList.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/lib/PageList.php 2014-12-05 13:24:38 UTC (rev 9423) @@ -115,29 +115,35 @@ 'alt' => '.')); else $noimg = HTML::raw(''); + $reverse = false; if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg $sortby = $pagelist->sortby($colNum, 'flip_order'); $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename $src = $WikiTheme->getButtonURL($desc ? 'sort_up' : 'sort_down'); - $reverse = $desc ? _("reverse") . " " : ""; + $reverse = $desc; } else { // initially unsorted $sortby = $pagelist->sortby($colNum, 'get'); } if (!$src) { $img = $noimg; - $reverse = ""; + $reverse = false; $img->setAttr('alt', "."); } else { $img = HTML::img(array('src' => $src, 'alt' => _("Click to reverse sort order"))); } + if ($reverse) { + $title = _("Click to sort by reverse %s"); + } else { + $title = _("Click to sort by %s"); + } $s = HTML::a(array('href' => - //Fixme: pass all also other GET args along. (limit is ok, p[]) + //Fixme: pass all also other GET args along. (limit is ok, p[]) $request->GetURLtoSelf(array('sortby' => $sortby, 'id' => $pagelist->id)), 'class' => 'gridbutton', - 'title' => sprintf(_("Click to sort by %s"), $reverse . $this->_field)), + 'title' => sprintf($title, $this->_heading)), $this->_heading, $img); } else { Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/de.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -1030,13 +1030,14 @@ msgid "Sort by %s" msgstr "Sortiere nach %s" -msgid "reverse" -msgstr "umdrehen" - msgid "Click to reverse sort order" msgstr "Klicken Sie um die Reihenfolge umzudrehen" #, php-format +msgid "Click to sort by reverse %s" +msgstr "Sortiere nach umdrehen %s" + +#, php-format msgid "Click to sort by %s" msgstr "Sortiere nach %s" @@ -6040,6 +6041,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "reverse" +#~ msgstr "umdrehen" + #~ msgid "" #~ "Invalid filename. File names may only contain alphanumeric characters and " #~ "dot, underscore, space or dash." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/es.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1011,13 +1011,14 @@ msgid "Sort by %s" msgstr "Clase por %s" -msgid "reverse" -msgstr "invierta" - msgid "Click to reverse sort order" msgstr "Tecleo para invertir orden de la clase" #, php-format +msgid "Click to sort by reverse %s" +msgstr "Clase por invierta %s" + +#, php-format msgid "Click to sort by %s" msgstr "Clase por %s" @@ -5870,6 +5871,9 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "reverse" +#~ msgstr "invierta" + #~ msgid "No LDAP in this PHP version" #~ msgstr "Ningún LDAP en esta versión de PHP" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/fr.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -1011,13 +1011,14 @@ msgid "Sort by %s" msgstr "Trier par %s" -msgid "reverse" -msgstr "inverser" - msgid "Click to reverse sort order" msgstr "Cliquez pour inverser le tri" #, php-format +msgid "Click to sort by reverse %s" +msgstr "Cliquez pour trier par %s inverse" + +#, php-format msgid "Click to sort by %s" msgstr "Cliquez pour trier par %s" @@ -5957,6 +5958,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "reverse" +#~ msgstr "inverser" + #~ msgid "" #~ "Invalid filename. File names may only contain alphanumeric characters and " #~ "dot, underscore, space or dash." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/it.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -995,13 +995,14 @@ msgid "Sort by %s" msgstr "Ordina per %s" -msgid "reverse" -msgstr "ritorni" - msgid "Click to reverse sort order" msgstr "" #, php-format +msgid "Click to sort by reverse %s" +msgstr "" + +#, php-format msgid "Click to sort by %s" msgstr "" @@ -5814,6 +5815,9 @@ msgid "Edit this page" msgstr "" +#~ msgid "reverse" +#~ msgstr "ritorni" + #~ msgid "Your home page is locked so your preferences cannot not be saved." #~ msgstr "" #~ "Questa pagina è stata bloccata dall'amministratore in modo da i vostri " Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/ja.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -993,13 +993,14 @@ msgid "Sort by %s" msgstr "%sでソートします。" -msgid "reverse" -msgstr "" - msgid "Click to reverse sort order" msgstr "" #, fuzzy, php-format +msgid "Click to sort by reverse %s" +msgstr "%sでソートします。" + +#, fuzzy, php-format msgid "Click to sort by %s" msgstr "%sでソートします。" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/nl.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -986,10 +986,11 @@ msgid "Sort by %s" msgstr "" -msgid "reverse" +msgid "Click to reverse sort order" msgstr "" -msgid "Click to reverse sort order" +#, php-format +msgid "Click to sort by reverse %s" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/phpwiki.pot 2014-12-05 13:24:38 UTC (rev 9423) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -980,10 +980,11 @@ msgid "Sort by %s" msgstr "" -msgid "reverse" +msgid "Click to reverse sort order" msgstr "" -msgid "Click to reverse sort order" +#, php-format +msgid "Click to sort by reverse %s" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/sv.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -981,10 +981,11 @@ msgid "Sort by %s" msgstr "" -msgid "reverse" +msgid "Click to reverse sort order" msgstr "" -msgid "Click to reverse sort order" +#, php-format +msgid "Click to sort by reverse %s" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-12-05 13:12:53 UTC (rev 9422) +++ trunk/locale/po/zh.po 2014-12-05 13:24:38 UTC (rev 9423) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-03 17:13+0100\n" +"POT-Creation-Date: 2014-12-05 14:22+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1023,13 +1023,13 @@ msgid "Sort by %s" msgstr "以 %s 排序" -#, fuzzy -msgid "reverse" -msgstr "重設" - msgid "Click to reverse sort order" msgstr "點擊以反轉排列順序" +#, fuzzy, php-format +msgid "Click to sort by reverse %s" +msgstr "點擊以 %s 排序" + #, php-format msgid "Click to sort by %s" msgstr "點擊以 %s 排序" @@ -6114,6 +6114,10 @@ msgid "Edit this page" msgstr "編輯此頁面" +#, fuzzy +#~ msgid "reverse" +#~ msgstr "重設" + #~ msgid "Unable to open directory “%s” for reading" #~ msgstr "無法開啟目錄 “%s” 進行讀取" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-05 14:45:28
|
Revision: 9424 http://sourceforge.net/p/phpwiki/code/9424 Author: vargenau Date: 2014-12-05 14:45:24 +0000 (Fri, 05 Dec 2014) Log Message: ----------- Improve translations in wiki creation and upgrade Modified Paths: -------------- trunk/lib/loadsave.php trunk/lib/upgrade.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/lib/loadsave.php 2014-12-05 14:45:24 UTC (rev 9424) @@ -63,33 +63,10 @@ if (is_a($request, 'MockRequest')) return; $action = $request->getArg('action'); - $label = ''; - switch ($action) { - case 'zip': - $label = _("ZIP files of database"); - break; - case 'dumpserial': - $label = _("Dump to directory"); - break; - case 'upload': - $label = _("Upload File"); - break; - case 'loadfile': - $label = _("Load File"); - break; - case 'upgrade': - $label = _("Upgrade"); - break; - case 'dumphtml': - case 'ziphtml': - $label = _("Dump Pages as XHTML"); - break; - } - if ($label) $label = str_replace(" ", "_", $label); if ($action == 'browse') // loading virgin $pagelink = WikiLink(HOME_PAGE); else - $pagelink = WikiLink(new WikiPageName(_("PhpWikiAdministration"), false, $label)); + $pagelink = WikiLink(new WikiPageName(__("PhpWikiAdministration"))); // do deferred sendPageChangeNotification() if (!empty($request->_deferredPageChangeNotification)) { @@ -1536,7 +1513,8 @@ $pagename = __("InterWikiMap"); $map = $dbi->getPage($pagename); $map->set('locked', true); - PrintXML(HTML::p(HTML::em(WikiLink($pagename)), HTML::strong(" locked"))); + PrintXML(HTML::p(HTML::em(WikiLink($pagename)), + HTML::strong(" "._("locked")))); EndLoadDump($request); } Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/lib/upgrade.php 2014-12-05 14:45:24 UTC (rev 9424) @@ -402,8 +402,8 @@ return; } } - echo "db version: we want ", $this->current_db_version, "\n<br />"; - echo "db version: we have ", $this->db_version, "\n<br />"; + echo _("db version: we want "), $this->current_db_version, "\n<br />"; + echo _("db version: we have "), $this->db_version, "\n<br />"; if ($this->db_version >= $this->current_db_version) { echo _("OK"), "<br />\n"; return; @@ -426,7 +426,7 @@ if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) { if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) { - trigger_error("You need to upgrade to schema/psql-initialize.sql manually!", + trigger_error(_("You need to upgrade to schema/psql-initialize.sql manually!"), E_USER_WARNING); // $this->_upgrade_psql_tsearch2(); } Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/de.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -516,29 +516,6 @@ msgid "unknown color %s ignored" msgstr "unbekannte Farbe %s ignoriert" -msgid "ZIP files of database" -msgstr "Speichern und Archivieren" - -msgid "Dump to directory" -msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern" - -msgid "Upload File" -msgstr "Datei Hochladen" - -msgid "Load File" -msgstr "Datei Laden" - -msgid "Upgrade" -msgstr "Updaten" - -msgid "Dump Pages as XHTML" -msgstr "Seiten als XHTML schreiben" - -# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten -# must also be renamed to match what is here. -msgid "PhpWikiAdministration" -msgstr "PhpWikiSystemverwalten" - # (Wrong Translation; sorry, but the German term for edit is NOT # editieren, but e d i e r e n). #, php-format @@ -605,6 +582,11 @@ msgid "%s bytes written" msgstr "%s Bytes geschrieben" +# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten +# must also be renamed to match what is here. +msgid "PhpWikiAdministration" +msgstr "PhpWikiSystemverwalten" + #, php-format msgid "... copied to %s" msgstr "... kopiert nach %s" @@ -739,6 +721,9 @@ msgid "Loading up virgin wiki" msgstr "Lade neue Seiten in das frische Wiki" +msgid "locked" +msgstr "gesperrt" + msgid "No uploaded file to upload?" msgstr "Keine Datei zum Hochladen?" @@ -1108,9 +1093,6 @@ msgid "Locked" msgstr "Gesperrt" -msgid "locked" -msgstr "gesperrt" - msgid "External" msgstr "Externe" @@ -3904,9 +3886,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "Datei Laden" + msgid "Dump Pages" msgstr "Seiten Schreiben" +msgid "Dump Pages as XHTML" +msgstr "Seiten als XHTML schreiben" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "WikiForm: %s: unbekannte Aktion" @@ -4675,6 +4663,12 @@ msgid "database" msgstr "Datenbank" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "Backend Typ: " @@ -4682,6 +4676,9 @@ msgid "Check for table %s" msgstr "Prüfe Tabelle %s" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "Prüfe auf neue Spalte session.sess_ip column" @@ -5841,6 +5838,9 @@ msgid "Like Pages" msgstr "Ähnliche Seiten" +msgid "Upload File" +msgstr "Datei Hochladen" + msgid "Wiki Admin" msgstr "" @@ -6041,6 +6041,15 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "ZIP files of database" +#~ msgstr "Speichern und Archivieren" + +#~ msgid "Dump to directory" +#~ msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern" + +#~ msgid "Upgrade" +#~ msgstr "Updaten" + #~ msgid "reverse" #~ msgstr "umdrehen" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/es.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -510,27 +510,6 @@ msgid "unknown color %s ignored" msgstr "el color desconocido %s no hizo caso" -msgid "ZIP files of database" -msgstr "Archivos del ZIP de la base de datos" - -msgid "Dump to directory" -msgstr "Descarga al directorio" - -msgid "Upload File" -msgstr "Archivo Del Upload" - -msgid "Load File" -msgstr "Archivo De la Carga" - -msgid "Upgrade" -msgstr "Mejora" - -msgid "Dump Pages as XHTML" -msgstr "" - -msgid "PhpWikiAdministration" -msgstr "AdministraciónDePhpWiki" - #, php-format msgid "Edited by: %s" msgstr "Editar: %s" @@ -592,6 +571,9 @@ msgid "%s bytes written" msgstr "%s octetos" +msgid "PhpWikiAdministration" +msgstr "AdministraciónDePhpWiki" + #, php-format msgid "... copied to %s" msgstr "... copia de [%s]" @@ -722,6 +704,9 @@ msgid "Loading up virgin wiki" msgstr "El cargar encima de wiki virginal" +msgid "locked" +msgstr "bloqueada" + msgid "No uploaded file to upload?" msgstr "¿Ningún archivo uploaded a upload?" @@ -1089,9 +1074,6 @@ msgid "Locked" msgstr "Bloqueada" -msgid "locked" -msgstr "bloqueada" - msgid "External" msgstr "Externos" @@ -3799,9 +3781,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "Archivo De la Carga" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "" @@ -4553,6 +4541,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4560,6 +4554,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5686,6 +5683,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "Archivo Del Upload" + msgid "Wiki Admin" msgstr "Administración de Wiki" @@ -5871,6 +5871,15 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "ZIP files of database" +#~ msgstr "Archivos del ZIP de la base de datos" + +#~ msgid "Dump to directory" +#~ msgstr "Descarga al directorio" + +#~ msgid "Upgrade" +#~ msgstr "Mejora" + #~ msgid "reverse" #~ msgstr "invierta" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/fr.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -511,27 +511,6 @@ msgid "unknown color %s ignored" msgstr "couleur %s non valable ignorée" -msgid "ZIP files of database" -msgstr "Récupérer dans un fichier ZIP" - -msgid "Dump to directory" -msgstr "Récupération dans le répertoire" - -msgid "Upload File" -msgstr "Déposer un fichier" - -msgid "Load File" -msgstr "Importer un fichier" - -msgid "Upgrade" -msgstr "Mettre à jour" - -msgid "Dump Pages as XHTML" -msgstr "Exporter les pages en XHTML" - -msgid "PhpWikiAdministration" -msgstr "AdministrationDePhpWiki" - #, php-format msgid "Edited by: %s" msgstr "Modifié par : %s" @@ -594,6 +573,9 @@ msgid "%s bytes written" msgstr "%s octets enregistrés" +msgid "PhpWikiAdministration" +msgstr "AdministrationDePhpWiki" + #, php-format msgid "... copied to %s" msgstr "... copié à %s" @@ -723,6 +705,9 @@ msgid "Loading up virgin wiki" msgstr "Chargement du nouveau wiki" +msgid "locked" +msgstr "verrouillé" + msgid "No uploaded file to upload?" msgstr "Pas de fichier à déposer ?" @@ -1089,9 +1074,6 @@ msgid "Locked" msgstr "Verrouillé" -msgid "locked" -msgstr "verrouillé" - msgid "External" msgstr "Externe" @@ -3858,9 +3840,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "Importer un fichier" + msgid "Dump Pages" msgstr "Récupérer les pages" +msgid "Dump Pages as XHTML" +msgstr "Exporter les pages en XHTML" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "FormulaireWiki : %s : action inconnue" @@ -4619,13 +4607,22 @@ msgid "database" msgstr "base de données" +msgid "db version: we want " +msgstr "Version de la base de données : on veut " + +msgid "db version: we have " +msgstr "Version de la base de données : on a " + msgid "Backend type: " -msgstr "" +msgstr "Type de backend : " #, php-format msgid "Check for table %s" msgstr "vérifie la table %s" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "Vous devez mettre à jour schema/psql-initialize.sql à la main !" + msgid "Check for new session.sess_ip column" msgstr "recherche une nouvelle colonne session.sess_ip" @@ -4684,10 +4681,10 @@ msgstr "" msgid "DB admin user:" -msgstr "DB admin nom de user :" +msgstr "Identifiant de l'administrateur de la base de données :" msgid "DB admin password:" -msgstr "DB admin mot de passe :" +msgstr "Mot de passe de l'administrateur de la base de données :" msgid "Check for extra page.cached_html column" msgstr "recherche une extra colonne page.cached_html" @@ -5771,6 +5768,9 @@ msgid "Like Pages" msgstr "Pages semblables" +msgid "Upload File" +msgstr "Déposer un fichier" + msgid "Wiki Admin" msgstr "Administration du wiki" @@ -5958,6 +5958,15 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "ZIP files of database" +#~ msgstr "Récupérer dans un fichier ZIP" + +#~ msgid "Dump to directory" +#~ msgstr "Récupération dans le répertoire" + +#~ msgid "Upgrade" +#~ msgstr "Mettre à jour" + #~ msgid "reverse" #~ msgstr "inverser" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/it.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -500,27 +500,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -msgid "Dump to directory" -msgstr "" - -msgid "Upload File" -msgstr "" - -msgid "Load File" -msgstr "" - -msgid "Upgrade" -msgstr "" - -msgid "Dump Pages as XHTML" -msgstr "" - -msgid "PhpWikiAdministration" -msgstr "" - #, php-format msgid "Edited by: %s" msgstr "Modifica: %s" @@ -583,6 +562,9 @@ msgid "%s bytes written" msgstr "" +msgid "PhpWikiAdministration" +msgstr "" + #, php-format msgid "... copied to %s" msgstr "... copia di %s" @@ -711,6 +693,9 @@ msgid "Loading up virgin wiki" msgstr "" +msgid "locked" +msgstr "bloccata" + msgid "No uploaded file to upload?" msgstr "" @@ -1073,9 +1058,6 @@ msgid "Locked" msgstr "Bloccata" -msgid "locked" -msgstr "bloccata" - msgid "External" msgstr "Esterni" @@ -3768,9 +3750,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "" @@ -4518,6 +4506,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4525,6 +4519,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5630,6 +5627,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "" + msgid "Wiki Admin" msgstr "Wiki Amministrazione" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/ja.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -489,27 +489,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -msgid "Dump to directory" -msgstr "" - -msgid "Upload File" -msgstr "ファイル読込み" - -msgid "Load File" -msgstr "ファイル読込み" - -msgid "Upgrade" -msgstr "" - -msgid "Dump Pages as XHTML" -msgstr "XHTMLで出力" - -msgid "PhpWikiAdministration" -msgstr "" - #, php-format msgid "Edited by: %s" msgstr "編集: %s" @@ -570,6 +549,9 @@ msgid "%s bytes written" msgstr "%s バイト書き込みました" +msgid "PhpWikiAdministration" +msgstr "" + #, php-format msgid "... copied to %s" msgstr "" @@ -700,6 +682,9 @@ msgid "Loading up virgin wiki" msgstr "" +msgid "locked" +msgstr "ロックしました" + msgid "No uploaded file to upload?" msgstr "" @@ -1073,9 +1058,6 @@ msgid "Locked" msgstr "ロックしました" -msgid "locked" -msgstr "ロックしました" - msgid "External" msgstr "" @@ -3830,9 +3812,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "ファイル読込み" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "XHTMLで出力" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "WikiForm: “%s” は未知の操作です。" @@ -4658,6 +4646,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4665,6 +4659,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5815,6 +5812,9 @@ msgid "Like Pages" msgstr "ページロック" +msgid "Upload File" +msgstr "ファイル読込み" + #, fuzzy msgid "Wiki Admin" msgstr "管理" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/nl.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -493,27 +493,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -msgid "Dump to directory" -msgstr "" - -msgid "Upload File" -msgstr "" - -msgid "Load File" -msgstr "" - -msgid "Upgrade" -msgstr "" - -msgid "Dump Pages as XHTML" -msgstr "" - -msgid "PhpWikiAdministration" -msgstr "PhpWikiBeheer" - #, php-format msgid "Edited by: %s" msgstr "Verander von: %s" @@ -574,6 +553,9 @@ msgid "%s bytes written" msgstr "" +msgid "PhpWikiAdministration" +msgstr "PhpWikiBeheer" + #, php-format msgid "... copied to %s" msgstr "" @@ -702,6 +684,9 @@ msgid "Loading up virgin wiki" msgstr "Laden van maagdelijke wiki" +msgid "locked" +msgstr "låst" + msgid "No uploaded file to upload?" msgstr "" @@ -1064,9 +1049,6 @@ msgid "Locked" msgstr "Låst" -msgid "locked" -msgstr "låst" - msgid "External" msgstr "" @@ -3760,9 +3742,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "" @@ -4510,6 +4498,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4517,6 +4511,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5622,6 +5619,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "" + msgid "Wiki Admin" msgstr "PhpWiki Beheer" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/phpwiki.pot 2014-12-05 14:45:24 UTC (rev 9424) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -487,27 +487,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -msgid "Dump to directory" -msgstr "" - -msgid "Upload File" -msgstr "" - -msgid "Load File" -msgstr "" - -msgid "Upgrade" -msgstr "" - -msgid "Dump Pages as XHTML" -msgstr "" - -msgid "PhpWikiAdministration" -msgstr "" - #, php-format msgid "Edited by: %s" msgstr "" @@ -568,6 +547,9 @@ msgid "%s bytes written" msgstr "" +msgid "PhpWikiAdministration" +msgstr "" + #, php-format msgid "... copied to %s" msgstr "" @@ -696,6 +678,9 @@ msgid "Loading up virgin wiki" msgstr "" +msgid "locked" +msgstr "" + msgid "No uploaded file to upload?" msgstr "" @@ -1058,9 +1043,6 @@ msgid "Locked" msgstr "" -msgid "locked" -msgstr "" - msgid "External" msgstr "" @@ -3752,9 +3734,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "" @@ -4502,6 +4490,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4509,6 +4503,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5614,6 +5611,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "" + msgid "Wiki Admin" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/sv.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -488,27 +488,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -msgid "Dump to directory" -msgstr "" - -msgid "Upload File" -msgstr "" - -msgid "Load File" -msgstr "" - -msgid "Upgrade" -msgstr "" - -msgid "Dump Pages as XHTML" -msgstr "" - -msgid "PhpWikiAdministration" -msgstr "" - #, php-format msgid "Edited by: %s" msgstr "" @@ -569,6 +548,9 @@ msgid "%s bytes written" msgstr "" +msgid "PhpWikiAdministration" +msgstr "" + #, php-format msgid "... copied to %s" msgstr "... kopia är %s" @@ -697,6 +679,9 @@ msgid "Loading up virgin wiki" msgstr "" +msgid "locked" +msgstr "låst" + msgid "No uploaded file to upload?" msgstr "" @@ -1059,9 +1044,6 @@ msgid "Locked" msgstr "Låst" -msgid "locked" -msgstr "låst" - msgid "External" msgstr "" @@ -3753,9 +3735,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "" + msgid "Dump Pages" msgstr "" +msgid "Dump Pages as XHTML" +msgstr "" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "" @@ -4503,6 +4491,12 @@ msgid "database" msgstr "" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4510,6 +4504,9 @@ msgid "Check for table %s" msgstr "" +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5615,6 +5612,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "" + msgid "Wiki Admin" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-12-05 13:24:38 UTC (rev 9423) +++ trunk/locale/po/zh.po 2014-12-05 14:45:24 UTC (rev 9424) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-05 14:22+0100\n" +"POT-Creation-Date: 2014-12-05 15:43+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -512,29 +512,6 @@ msgid "unknown color %s ignored" msgstr "" -msgid "ZIP files of database" -msgstr "" - -#, fuzzy -msgid "Dump to directory" -msgstr "目錄 “%s”" - -msgid "Upload File" -msgstr "載入檔案" - -msgid "Load File" -msgstr "載入檔案" - -#, fuzzy -msgid "Upgrade" -msgstr "上傳" - -msgid "Dump Pages as XHTML" -msgstr "傾印頁面為 XHTML" - -msgid "PhpWikiAdministration" -msgstr "" - #, php-format msgid "Edited by: %s" msgstr "由 %s 編輯" @@ -595,6 +572,9 @@ msgid "%s bytes written" msgstr "已寫入 %s bytes" +msgid "PhpWikiAdministration" +msgstr "" + #, php-format msgid "... copied to %s" msgstr "... 複製到 %s" @@ -728,6 +708,9 @@ msgid "Loading up virgin wiki" msgstr "載入原始 wiki" +msgid "locked" +msgstr "被鎖定" + msgid "No uploaded file to upload?" msgstr "沒有要上傳的檔案?" @@ -1102,9 +1085,6 @@ msgid "Locked" msgstr "已鎖定" -msgid "locked" -msgstr "被鎖定" - #, fuzzy msgid "External" msgstr "外部連結" @@ -3923,9 +3903,15 @@ msgid "Provide generic WikiForm input buttons." msgstr "" +msgid "Load File" +msgstr "載入檔案" + msgid "Dump Pages" msgstr "傾印頁面" +msgid "Dump Pages as XHTML" +msgstr "傾印頁面為 XHTML" + #, php-format msgid "WikiForm: %s: unknown action" msgstr "WikiForm: %s: 未知的動作" @@ -4737,6 +4723,12 @@ msgid "database" msgstr "資料庫" +msgid "db version: we want " +msgstr "" + +msgid "db version: we have " +msgstr "" + msgid "Backend type: " msgstr "" @@ -4744,6 +4736,9 @@ msgid "Check for table %s" msgstr "為 page “%s” 設定 acl." +msgid "You need to upgrade to schema/psql-initialize.sql manually!" +msgstr "" + msgid "Check for new session.sess_ip column" msgstr "" @@ -5909,6 +5904,9 @@ msgid "Like Pages" msgstr "" +msgid "Upload File" +msgstr "載入檔案" + msgid "Wiki Admin" msgstr "" @@ -6115,6 +6113,14 @@ msgstr "編輯此頁面" #, fuzzy +#~ msgid "Dump to directory" +#~ msgstr "目錄 “%s”" + +#, fuzzy +#~ msgid "Upgrade" +#~ msgstr "上傳" + +#, fuzzy #~ msgid "reverse" #~ msgstr "重設" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-05 14:54:10
|
Revision: 9425 http://sourceforge.net/p/phpwiki/code/9425 Author: vargenau Date: 2014-12-05 14:54:07 +0000 (Fri, 05 Dec 2014) Log Message: ----------- ActionPage --> Action Page Modified Paths: -------------- trunk/locale/po/fr.po trunk/themes/MonoBook/templates/actionbar.tmpl Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-12-05 14:45:24 UTC (rev 9424) +++ trunk/locale/po/fr.po 2014-12-05 14:54:07 UTC (rev 9425) @@ -4582,14 +4582,14 @@ #, php-format msgid "Check for necessary %s updates" -msgstr "" +msgstr "Vérification des mises à jour nécessaires pour %s" msgid "ActionPage" -msgstr "" +msgstr "Pages d'action" #, php-format msgid "Check for necessary theme %s updates" -msgstr "" +msgstr "Vérification des mises à jour nécessaires pour le thème %s" msgid "rename to Help: pages" msgstr "" Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2014-12-05 14:45:24 UTC (rev 9424) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2014-12-05 14:54:07 UTC (rev 9425) @@ -11,7 +11,7 @@ <?php if (!string_ends_with($pagename, '/'._("Discussion"))) { ?> <?php $talk = new WikiPageName('Talk:'.$pagename); ?> <?php echo ActionButton(array(), - $isActionPage ? _("ActionPage") : _("Article"), + $isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?> <?php if (!$isActionPage) { ?> <?php if ($dbh->isWikiPage($talk->getName())) { ?> @@ -24,7 +24,7 @@ <?php } ?> <?php } else { $talk = new WikiPageName($pagename); ?> - <?php echo ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?> + <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?> <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> <?php } ?> <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-16 13:44:51
|
Revision: 9443 http://sourceforge.net/p/phpwiki/code/9443 Author: vargenau Date: 2014-12-16 13:44:44 +0000 (Tue, 16 Dec 2014) Log Message: ----------- Add Composer and Twig Added Paths: ----------- trunk/composer.json trunk/composer.lock trunk/vendor/ trunk/vendor/autoload.php trunk/vendor/bin/ trunk/vendor/bin/composer trunk/vendor/composer/ trunk/vendor/composer/ClassLoader.php trunk/vendor/composer/autoload_classmap.php trunk/vendor/composer/autoload_namespaces.php trunk/vendor/composer/autoload_psr4.php trunk/vendor/composer/autoload_real.php trunk/vendor/composer/installed.json trunk/vendor/twig/ trunk/vendor/twig/twig/ trunk/vendor/twig/twig/.editorconfig trunk/vendor/twig/twig/.gitignore trunk/vendor/twig/twig/.travis.yml trunk/vendor/twig/twig/CHANGELOG trunk/vendor/twig/twig/LICENSE trunk/vendor/twig/twig/README.rst trunk/vendor/twig/twig/composer.json trunk/vendor/twig/twig/doc/ trunk/vendor/twig/twig/doc/advanced.rst trunk/vendor/twig/twig/doc/advanced_legacy.rst trunk/vendor/twig/twig/doc/api.rst trunk/vendor/twig/twig/doc/coding_standards.rst trunk/vendor/twig/twig/doc/deprecated.rst trunk/vendor/twig/twig/doc/filters/ trunk/vendor/twig/twig/doc/filters/abs.rst trunk/vendor/twig/twig/doc/filters/batch.rst trunk/vendor/twig/twig/doc/filters/capitalize.rst trunk/vendor/twig/twig/doc/filters/convert_encoding.rst trunk/vendor/twig/twig/doc/filters/date.rst trunk/vendor/twig/twig/doc/filters/date_modify.rst trunk/vendor/twig/twig/doc/filters/default.rst trunk/vendor/twig/twig/doc/filters/escape.rst trunk/vendor/twig/twig/doc/filters/first.rst trunk/vendor/twig/twig/doc/filters/format.rst trunk/vendor/twig/twig/doc/filters/index.rst trunk/vendor/twig/twig/doc/filters/join.rst trunk/vendor/twig/twig/doc/filters/json_encode.rst trunk/vendor/twig/twig/doc/filters/keys.rst trunk/vendor/twig/twig/doc/filters/last.rst trunk/vendor/twig/twig/doc/filters/length.rst trunk/vendor/twig/twig/doc/filters/lower.rst trunk/vendor/twig/twig/doc/filters/merge.rst trunk/vendor/twig/twig/doc/filters/nl2br.rst trunk/vendor/twig/twig/doc/filters/number_format.rst trunk/vendor/twig/twig/doc/filters/raw.rst trunk/vendor/twig/twig/doc/filters/replace.rst trunk/vendor/twig/twig/doc/filters/reverse.rst trunk/vendor/twig/twig/doc/filters/round.rst trunk/vendor/twig/twig/doc/filters/slice.rst trunk/vendor/twig/twig/doc/filters/sort.rst trunk/vendor/twig/twig/doc/filters/split.rst trunk/vendor/twig/twig/doc/filters/striptags.rst trunk/vendor/twig/twig/doc/filters/title.rst trunk/vendor/twig/twig/doc/filters/trim.rst trunk/vendor/twig/twig/doc/filters/upper.rst trunk/vendor/twig/twig/doc/filters/url_encode.rst trunk/vendor/twig/twig/doc/functions/ trunk/vendor/twig/twig/doc/functions/attribute.rst trunk/vendor/twig/twig/doc/functions/block.rst trunk/vendor/twig/twig/doc/functions/constant.rst trunk/vendor/twig/twig/doc/functions/cycle.rst trunk/vendor/twig/twig/doc/functions/date.rst trunk/vendor/twig/twig/doc/functions/dump.rst trunk/vendor/twig/twig/doc/functions/include.rst trunk/vendor/twig/twig/doc/functions/index.rst trunk/vendor/twig/twig/doc/functions/max.rst trunk/vendor/twig/twig/doc/functions/min.rst trunk/vendor/twig/twig/doc/functions/parent.rst trunk/vendor/twig/twig/doc/functions/random.rst trunk/vendor/twig/twig/doc/functions/range.rst trunk/vendor/twig/twig/doc/functions/source.rst trunk/vendor/twig/twig/doc/functions/template_from_string.rst trunk/vendor/twig/twig/doc/index.rst trunk/vendor/twig/twig/doc/installation.rst trunk/vendor/twig/twig/doc/internals.rst trunk/vendor/twig/twig/doc/intro.rst trunk/vendor/twig/twig/doc/recipes.rst trunk/vendor/twig/twig/doc/tags/ trunk/vendor/twig/twig/doc/tags/autoescape.rst trunk/vendor/twig/twig/doc/tags/block.rst trunk/vendor/twig/twig/doc/tags/do.rst trunk/vendor/twig/twig/doc/tags/embed.rst trunk/vendor/twig/twig/doc/tags/extends.rst trunk/vendor/twig/twig/doc/tags/filter.rst trunk/vendor/twig/twig/doc/tags/flush.rst trunk/vendor/twig/twig/doc/tags/for.rst trunk/vendor/twig/twig/doc/tags/from.rst trunk/vendor/twig/twig/doc/tags/if.rst trunk/vendor/twig/twig/doc/tags/import.rst trunk/vendor/twig/twig/doc/tags/include.rst trunk/vendor/twig/twig/doc/tags/index.rst trunk/vendor/twig/twig/doc/tags/macro.rst trunk/vendor/twig/twig/doc/tags/sandbox.rst trunk/vendor/twig/twig/doc/tags/set.rst trunk/vendor/twig/twig/doc/tags/spaceless.rst trunk/vendor/twig/twig/doc/tags/use.rst trunk/vendor/twig/twig/doc/tags/verbatim.rst trunk/vendor/twig/twig/doc/templates.rst trunk/vendor/twig/twig/doc/tests/ trunk/vendor/twig/twig/doc/tests/constant.rst trunk/vendor/twig/twig/doc/tests/defined.rst trunk/vendor/twig/twig/doc/tests/divisibleby.rst trunk/vendor/twig/twig/doc/tests/empty.rst trunk/vendor/twig/twig/doc/tests/even.rst trunk/vendor/twig/twig/doc/tests/index.rst trunk/vendor/twig/twig/doc/tests/iterable.rst trunk/vendor/twig/twig/doc/tests/null.rst trunk/vendor/twig/twig/doc/tests/odd.rst trunk/vendor/twig/twig/doc/tests/sameas.rst trunk/vendor/twig/twig/ext/ trunk/vendor/twig/twig/ext/twig/ trunk/vendor/twig/twig/ext/twig/.gitignore trunk/vendor/twig/twig/ext/twig/config.m4 trunk/vendor/twig/twig/ext/twig/config.w32 trunk/vendor/twig/twig/ext/twig/php_twig.h trunk/vendor/twig/twig/ext/twig/twig.c trunk/vendor/twig/twig/lib/ trunk/vendor/twig/twig/lib/Twig/ trunk/vendor/twig/twig/lib/Twig/Autoloader.php trunk/vendor/twig/twig/lib/Twig/Compiler.php trunk/vendor/twig/twig/lib/Twig/CompilerInterface.php trunk/vendor/twig/twig/lib/Twig/Environment.php trunk/vendor/twig/twig/lib/Twig/Error/ trunk/vendor/twig/twig/lib/Twig/Error/Loader.php trunk/vendor/twig/twig/lib/Twig/Error/Runtime.php trunk/vendor/twig/twig/lib/Twig/Error/Syntax.php trunk/vendor/twig/twig/lib/Twig/Error.php trunk/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php trunk/vendor/twig/twig/lib/Twig/ExpressionParser.php trunk/vendor/twig/twig/lib/Twig/Extension/ trunk/vendor/twig/twig/lib/Twig/Extension/Core.php trunk/vendor/twig/twig/lib/Twig/Extension/Debug.php trunk/vendor/twig/twig/lib/Twig/Extension/Escaper.php trunk/vendor/twig/twig/lib/Twig/Extension/Optimizer.php trunk/vendor/twig/twig/lib/Twig/Extension/Sandbox.php trunk/vendor/twig/twig/lib/Twig/Extension/Staging.php trunk/vendor/twig/twig/lib/Twig/Extension/StringLoader.php trunk/vendor/twig/twig/lib/Twig/Extension.php trunk/vendor/twig/twig/lib/Twig/ExtensionInterface.php trunk/vendor/twig/twig/lib/Twig/Filter/ trunk/vendor/twig/twig/lib/Twig/Filter/Function.php trunk/vendor/twig/twig/lib/Twig/Filter/Method.php trunk/vendor/twig/twig/lib/Twig/Filter/Node.php trunk/vendor/twig/twig/lib/Twig/Filter.php trunk/vendor/twig/twig/lib/Twig/FilterCallableInterface.php trunk/vendor/twig/twig/lib/Twig/FilterInterface.php trunk/vendor/twig/twig/lib/Twig/Function/ trunk/vendor/twig/twig/lib/Twig/Function/Function.php trunk/vendor/twig/twig/lib/Twig/Function/Method.php trunk/vendor/twig/twig/lib/Twig/Function/Node.php trunk/vendor/twig/twig/lib/Twig/Function.php trunk/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php trunk/vendor/twig/twig/lib/Twig/FunctionInterface.php trunk/vendor/twig/twig/lib/Twig/Lexer.php trunk/vendor/twig/twig/lib/Twig/LexerInterface.php trunk/vendor/twig/twig/lib/Twig/Loader/ trunk/vendor/twig/twig/lib/Twig/Loader/Array.php trunk/vendor/twig/twig/lib/Twig/Loader/Chain.php trunk/vendor/twig/twig/lib/Twig/Loader/Filesystem.php trunk/vendor/twig/twig/lib/Twig/Loader/String.php trunk/vendor/twig/twig/lib/Twig/LoaderInterface.php trunk/vendor/twig/twig/lib/Twig/Markup.php trunk/vendor/twig/twig/lib/Twig/Node/ trunk/vendor/twig/twig/lib/Twig/Node/AutoEscape.php trunk/vendor/twig/twig/lib/Twig/Node/Block.php trunk/vendor/twig/twig/lib/Twig/Node/BlockReference.php trunk/vendor/twig/twig/lib/Twig/Node/Body.php trunk/vendor/twig/twig/lib/Twig/Node/Do.php trunk/vendor/twig/twig/lib/Twig/Node/Embed.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/ trunk/vendor/twig/twig/lib/Twig/Node/Expression/Array.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/ trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Call.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/ trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Function.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Name.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/ trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/ trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php trunk/vendor/twig/twig/lib/Twig/Node/Expression.php trunk/vendor/twig/twig/lib/Twig/Node/Flush.php trunk/vendor/twig/twig/lib/Twig/Node/For.php trunk/vendor/twig/twig/lib/Twig/Node/ForLoop.php trunk/vendor/twig/twig/lib/Twig/Node/If.php trunk/vendor/twig/twig/lib/Twig/Node/Import.php trunk/vendor/twig/twig/lib/Twig/Node/Include.php trunk/vendor/twig/twig/lib/Twig/Node/Macro.php trunk/vendor/twig/twig/lib/Twig/Node/Module.php trunk/vendor/twig/twig/lib/Twig/Node/Print.php trunk/vendor/twig/twig/lib/Twig/Node/Sandbox.php trunk/vendor/twig/twig/lib/Twig/Node/SandboxedModule.php trunk/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php trunk/vendor/twig/twig/lib/Twig/Node/Set.php trunk/vendor/twig/twig/lib/Twig/Node/SetTemp.php trunk/vendor/twig/twig/lib/Twig/Node/Spaceless.php trunk/vendor/twig/twig/lib/Twig/Node/Text.php trunk/vendor/twig/twig/lib/Twig/Node.php trunk/vendor/twig/twig/lib/Twig/NodeInterface.php trunk/vendor/twig/twig/lib/Twig/NodeOutputInterface.php trunk/vendor/twig/twig/lib/Twig/NodeTraverser.php trunk/vendor/twig/twig/lib/Twig/NodeVisitor/ trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php trunk/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php trunk/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php trunk/vendor/twig/twig/lib/Twig/Parser.php trunk/vendor/twig/twig/lib/Twig/ParserInterface.php trunk/vendor/twig/twig/lib/Twig/Sandbox/ trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php trunk/vendor/twig/twig/lib/Twig/SimpleFilter.php trunk/vendor/twig/twig/lib/Twig/SimpleFunction.php trunk/vendor/twig/twig/lib/Twig/SimpleTest.php trunk/vendor/twig/twig/lib/Twig/Template.php trunk/vendor/twig/twig/lib/Twig/TemplateInterface.php trunk/vendor/twig/twig/lib/Twig/Test/ trunk/vendor/twig/twig/lib/Twig/Test/Function.php trunk/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php trunk/vendor/twig/twig/lib/Twig/Test/Method.php trunk/vendor/twig/twig/lib/Twig/Test/Node.php trunk/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php trunk/vendor/twig/twig/lib/Twig/Test.php trunk/vendor/twig/twig/lib/Twig/TestCallableInterface.php trunk/vendor/twig/twig/lib/Twig/TestInterface.php trunk/vendor/twig/twig/lib/Twig/Token.php trunk/vendor/twig/twig/lib/Twig/TokenParser/ trunk/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Block.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Do.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Embed.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Extends.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Filter.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Flush.php trunk/vendor/twig/twig/lib/Twig/TokenParser/For.php trunk/vendor/twig/twig/lib/Twig/TokenParser/From.php trunk/vendor/twig/twig/lib/Twig/TokenParser/If.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Import.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Include.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Macro.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Set.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php trunk/vendor/twig/twig/lib/Twig/TokenParser/Use.php trunk/vendor/twig/twig/lib/Twig/TokenParser.php trunk/vendor/twig/twig/lib/Twig/TokenParserBroker.php trunk/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php trunk/vendor/twig/twig/lib/Twig/TokenParserInterface.php trunk/vendor/twig/twig/lib/Twig/TokenStream.php trunk/vendor/twig/twig/phpunit.xml.dist trunk/vendor/twig/twig/test/ trunk/vendor/twig/twig/test/Twig/ trunk/vendor/twig/twig/test/Twig/Tests/ trunk/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php trunk/vendor/twig/twig/test/Twig/Tests/CompilerTest.php trunk/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php trunk/vendor/twig/twig/test/Twig/Tests/ErrorTest.php trunk/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php trunk/vendor/twig/twig/test/Twig/Tests/Extension/ trunk/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php trunk/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php trunk/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/ trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test trunk/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php trunk/vendor/twig/twig/test/Twig/Tests/LexerTest.php trunk/vendor/twig/twig/test/Twig/Tests/Loader/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php trunk/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php trunk/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/ trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig trunk/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/ trunk/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/ trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/ trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedModuleTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php trunk/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/ trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php trunk/vendor/twig/twig/test/Twig/Tests/ParserTest.php trunk/vendor/twig/twig/test/Twig/Tests/TemplateTest.php trunk/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php trunk/vendor/twig/twig/test/Twig/Tests/escapingTest.php trunk/vendor/twig/twig/test/bootstrap.php Added: trunk/composer.json =================================================================== --- trunk/composer.json (rev 0) +++ trunk/composer.json 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,5 @@ +{ + "require": { + "twig/twig": "~1.0" + } +} Added: trunk/composer.lock =================================================================== --- trunk/composer.lock (rev 0) +++ trunk/composer.lock 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,75 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "a31e651ea26a527432562441b3545e0a", + "packages": [ + { + "name": "twig/twig", + "version": "v1.16.2", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc", + "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.16-dev" + } + }, + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fa...@sy...", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Armin Ronacher", + "email": "arm...@ac...", + "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "https://github.com/fabpot/Twig/graphs/contributors", + "role": "Contributors" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ], + "time": "2014-10-17 12:53:44" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} Added: trunk/vendor/autoload.php =================================================================== --- trunk/vendor/autoload.php (rev 0) +++ trunk/vendor/autoload.php 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,7 @@ +<?php + +// autoload.php @generated by Composer + +require_once __DIR__ . '/composer' . '/autoload_real.php'; + +return ComposerAutoloaderInitac3ac6a53c444c96c86cc3afe46d2f91::getLoader(); Added: trunk/vendor/bin/composer =================================================================== (Binary files differ) Index: trunk/vendor/bin/composer =================================================================== --- trunk/vendor/bin/composer 2014-12-11 18:00:59 UTC (rev 9442) +++ trunk/vendor/bin/composer 2014-12-16 13:44:44 UTC (rev 9443) Property changes on: trunk/vendor/bin/composer ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/vendor/composer/ClassLoader.php =================================================================== --- trunk/vendor/composer/ClassLoader.php (rev 0) +++ trunk/vendor/composer/ClassLoader.php 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,387 @@ +<?php + +/* + * This file is part of Composer. + * + * (c) Nils Adermann <nad...@na...> + * Jordi Boggiano <j.b...@se...> + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0 class loader + * + * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier <fa...@sy...> + * @author Jordi Boggiano <j.b...@se...> + */ +class ClassLoader +{ + // PSR-4 + private $prefixLengthsPsr4 = array(); + private $prefixDirsPsr4 = array(); + private $fallbackDirsPsr4 = array(); + + // PSR-0 + private $prefixesPsr0 = array(); + private $fallbackDirsPsr0 = array(); + + private $useIncludePath = false; + private $classMap = array(); + + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', $this->prefixesPsr0); + } + + return array(); + } + + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + */ + public function add($prefix, $paths, $prepend = false) + { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + (array) $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + (array) $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = (array) $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + (array) $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-0 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + (array) $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + (array) $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + (array) $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + includeFile($file); + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if ($file === null && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if ($file === null) { + // Remember that this class does not exist. + return $this->classMap[$class] = false; + } + + return $file; + } + + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + } +} + +/** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + */ +function includeFile($file) +{ + include $file; +} Added: trunk/vendor/composer/autoload_classmap.php =================================================================== --- trunk/vendor/composer/autoload_classmap.php (rev 0) +++ trunk/vendor/composer/autoload_classmap.php 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,9 @@ +<?php + +// autoload_classmap.php @generated by Composer + +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = dirname($vendorDir); + +return array( +); Added: trunk/vendor/composer/autoload_namespaces.php =================================================================== --- trunk/vendor/composer/autoload_namespaces.php (rev 0) +++ trunk/vendor/composer/autoload_namespaces.php 2014-12-16 13:44:44 UTC (rev 9443) @@ -0,0 +1,10 @@ +<?php + +// autoload_namespaces.php @generated by Composer + +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = dirname($vendorDir); + +return array( + 'Twig_' => array($vendorDir . '/twig/twig/lib'), +); ... [truncated message content] |
From: <var...@us...> - 2014-12-17 14:33:49
|
Revision: 9446 http://sourceforge.net/p/phpwiki/code/9446 Author: vargenau Date: 2014-12-17 14:33:42 +0000 (Wed, 17 Dec 2014) Log Message: ----------- Remove EMailConfirm (unused) Modified Paths: -------------- trunk/TODO trunk/lib/MailNotify.php Removed Paths: ------------- trunk/lib/WikiUser/EMailConfirm.php Modified: trunk/TODO =================================================================== --- trunk/TODO 2014-12-17 14:25:01 UTC (rev 9445) +++ trunk/TODO 2014-12-17 14:33:42 UTC (rev 9446) @@ -38,7 +38,6 @@ * ATOM (experimentally done), TrackBack, PingBack services (take it from DokuWiki) * finish Blog theme * lang: mapping -* WikiUser/EMailConfirm (?) * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl * WikiUser/OpenID (from DokuWiki) - Status::in_work * more meta stuff: OpenSearch, format=dc (Dublin Core) Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2014-12-17 14:25:01 UTC (rev 9445) +++ trunk/lib/MailNotify.php 2014-12-17 14:33:42 UTC (rev 9446) @@ -31,7 +31,6 @@ * [Watch] WatchPage - add a page, or delete watch handlers into the users * pref[notifyPages] slot. * My WatchList - view or edit list/regex of pref[notifyPages]. - * EMailConfirm methods: send and verify * * Helper functions: * getPageChangeEmails Deleted: trunk/lib/WikiUser/EMailConfirm.php =================================================================== --- trunk/lib/WikiUser/EMailConfirm.php 2014-12-17 14:25:01 UTC (rev 9445) +++ trunk/lib/WikiUser/EMailConfirm.php 2014-12-17 14:33:42 UTC (rev 9446) @@ -1,67 +0,0 @@ -<?php - -/* - * Copyright (C) 2006 ReiniUrban - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -class _EMailConfirmPassUser - extends _PassUser - /** - * Unconfirmed users have ANON access, - * confirmed users are equal to passusers WIKIAUTH_USER. - * - * Users give their email at registration, phpwiki sends a link per email, - * user clicks on url link to verify, user is confirmed. - * - * Preferences are handled in _PassUser - */ -{ - // This can only be called from _PassUser, because the parent class - // sets the pref methods, before this class is initialized. - function _EMailConfirmPassUser($UserName = '', $prefs = false, $file = '') - { - if (!$this->_prefs and is_a($this, "_EMailPassUser")) { - if ($prefs) $this->_prefs = $prefs; - if (!isset($this->_prefs->_method)) - _PassUser::_PassUser($UserName); - } - $this->_userid = $UserName; - return $this; - } - - function userExists() - { - if (!$this->isValidName($this->_userid)) { - return $this->_tryNextUser(); - } - $this->_authmethod = 'EMailConfirm'; - // check the prefs for emailVerified - if ($this->_prefs->get('emailVerified')) - return true; - return $this->_tryNextUser(); - } -} - -// Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil -// End: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-09 15:48:22
|
Revision: 9459 http://sourceforge.net/p/phpwiki/code/9459 Author: vargenau Date: 2015-01-09 15:48:19 +0000 (Fri, 09 Jan 2015) Log Message: ----------- Remove nusoap Modified Paths: -------------- trunk/SOAP.php trunk/lib/Google.php trunk/locale/.exclude trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/update-makefile.sh trunk/locale/zh/LC_MESSAGES/phpwiki.mo Removed Paths: ------------- trunk/lib/nusoap/ Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/SOAP.php 2015-01-09 15:48:19 UTC (rev 9459) @@ -19,8 +19,6 @@ include_once './index.php'; include_once 'lib/main.php'; -if (!loadExtension('soap')) - require_once 'lib/nusoap/nusoap.php'; /* // bypass auth and request loop for now. Modified: trunk/lib/Google.php =================================================================== --- trunk/lib/Google.php 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/lib/Google.php 2015-01-09 15:48:19 UTC (rev 9459) @@ -169,7 +169,6 @@ return false; } else $this->license_key = GOOGLE_LICENSE_KEY; - require_once 'lib/nusoap/nusoap.php'; $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl"); $this->proxy = $this->soapclient->getProxy(); Modified: trunk/locale/.exclude =================================================================== --- trunk/locale/.exclude 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/.exclude 2015-01-09 15:48:19 UTC (rev 9459) @@ -1,26 +1 @@ -lib/template_lite/ -lib/pear/ lib/WikiDB/adodb/ -lib/nusoap/ -lib/fpdf/ -lib/XMLRPC/ -lib/AccessLog.php -lib/ASCIIMathPHP/ -lib/WikiDB/backend/cvsclient.php -lib/weather_class_inc.php -lib/plugin/NewUserWelcomePage.php -lib/plugin/GridTable.php -lib/plugin/RdfDefinition.php -lib/plugin/WikiAccessRestrictions.php -lib/plugin/WikiAdminSetAclSimple.php -lib/plugin/WikiAdminMassRevert.php -lib/plugin/WikiSettings.php -lib/plugin/WikiUserAdministration.php -lib/plugin/BlockQuote.php -lib/plugin/SpecialTag.php -themes/default/tiny_mce/ -themes/wikilens/templates/newuserwelcomepage.tmpl -themes/wikilens/templates/categorypage.tmpl -themes/archX/ -themes/film/ -themes/AVL/ Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/Makefile 2015-01-09 15:48:19 UTC (rev 9459) @@ -70,6 +70,8 @@ mo: zh/LC_MESSAGES/phpwiki.mo # ${POT_FILE}: ../lib/ArchiveCleaner.php +${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php +${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.class.php ${POT_FILE}: ../lib/AtomParser.php ${POT_FILE}: ../lib/BlockParser.php ${POT_FILE}: ../lib/CachedMarkup.php @@ -237,6 +239,7 @@ ${POT_FILE}: ../lib/plugin/WikiAdminSearchReplace.php ${POT_FILE}: ../lib/plugin/WikiAdminSelect.php ${POT_FILE}: ../lib/plugin/WikiAdminSetAcl.php +${POT_FILE}: ../lib/plugin/WikiAdminSetAclSimple.php ${POT_FILE}: ../lib/plugin/WikiAdminSetExternal.php ${POT_FILE}: ../lib/plugin/WikiAdminUtils.php ${POT_FILE}: ../lib/plugin/WikiBlog.php @@ -342,6 +345,7 @@ ${POT_FILE}: ../lib/XmlParser.php ${POT_FILE}: ../lib/XmlRpcClient.php ${POT_FILE}: ../lib/XmlRpcServer.php +${POT_FILE}: ../lib/XMLRPC/utils.php ${POT_FILE}: ../lib/ziplib.php ${POT_FILE}: ../themes/alphatest.php ${POT_FILE}: ../themes/blog/lib/RecentChanges.php @@ -483,8 +487,10 @@ ${POT_FILE}: ../themes/SpaceWiki/lib/RecentChanges.php ${POT_FILE}: ../themes/SpaceWiki/themeinfo.php ${POT_FILE}: ../themes/wikilens/templates/body.tmpl +${POT_FILE}: ../themes/wikilens/templates/categorypage.tmpl ${POT_FILE}: ../themes/wikilens/templates/head.tmpl ${POT_FILE}: ../themes/wikilens/templates/navbar.tmpl +${POT_FILE}: ../themes/wikilens/templates/newuserwelcomepage.tmpl ${POT_FILE}: ../themes/wikilens/templates/ratings.tmpl ${POT_FILE}: ../themes/wikilens/templates/top.tmpl ${POT_FILE}: ../themes/wikilens/themeinfo.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/de.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -769,23 +769,6 @@ msgid "User %s removed page %s" msgstr "Seite gelöscht %s von Benutzer %s" -msgid "E-mail address confirmation" -msgstr "E-Mail Bestätigung" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Datenbank wird optimiert" @@ -3815,6 +3798,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind." +msgid "E-mail address confirmation" +msgstr "E-Mail Bestätigung" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/es.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -753,23 +753,6 @@ msgid "User %s removed page %s" msgstr "El usuarios %s eliminado página %s" -msgid "E-mail address confirmation" -msgstr "Verificación Del Email" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Base de datos óptima" @@ -3710,6 +3693,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "Verificación Del Email" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/fr.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -753,23 +753,6 @@ msgid "User %s removed page %s" msgstr "L'utilisateur %s a supprimé la page %s" -msgid "E-mail address confirmation" -msgstr "Vérification de l'adresse électronique" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Optimisation de la base de données" @@ -3769,6 +3752,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "Vérification de l'adresse électronique" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/it.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -741,23 +741,6 @@ msgid "User %s removed page %s" msgstr "Utente %s pagina %s rimossa" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Base di dati d'ottimizzazione" @@ -3679,6 +3662,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/ja.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -730,23 +730,6 @@ msgid "User %s removed page %s" msgstr "ページをロックしました。" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - #, fuzzy msgid "Optimizing database" msgstr "%s を最適化中です" @@ -3738,6 +3721,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/nl.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -732,23 +732,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3671,6 +3654,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/phpwiki.pot 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -726,23 +726,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3663,6 +3646,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/sv.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -727,23 +727,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3664,6 +3647,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/zh.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -758,24 +758,6 @@ msgstr "頁面已被鎖定" #, fuzzy -msgid "E-mail address confirmation" -msgstr "Email 驗證" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - -#, fuzzy msgid "Optimizing database" msgstr "最佳化 %s" @@ -3827,6 +3809,10 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +#, fuzzy +msgid "E-mail address confirmation" +msgstr "Email 驗證" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/update-makefile.sh =================================================================== --- trunk/locale/update-makefile.sh 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/update-makefile.sh 2015-01-09 15:48:19 UTC (rev 9459) @@ -35,11 +35,10 @@ # Find all php and html source code which should be scanned # by xgettext() for localizeable strings. # find ../lib fails on cygwin -# TODO: autogenerate .exclude list from CVS/Entries pot_file_deps () { - test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude; echo lib/nusoap/ > .exclude ) - (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)\|\(^lib/nusoap\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) | - egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)|(^lib/nusoap)' | + test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude ) + (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) | + egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)' | grep -v -f .exclude | sed 's|^|${POT_FILE}: ../|;' | sort Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-12 10:42:44
|
Revision: 9462 http://sourceforge.net/p/phpwiki/code/9462 Author: vargenau Date: 2015-01-12 09:53:40 +0000 (Mon, 12 Jan 2015) Log Message: ----------- HTML::Raw --> HTML::raw Modified Paths: -------------- trunk/lib/InlineParser.php trunk/lib/PageList.php trunk/lib/WikiTheme.php trunk/lib/loadsave.php trunk/lib/stdlib.php trunk/lib/wikilens/RatingsDb.php trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/MonoBook/themeinfo.php trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Sidebar/themeinfo.php trunk/themes/wikilens/templates/body.tmpl Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/InlineParser.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1168,7 +1168,7 @@ function markup($match) { - return HTML::Raw($this->_entities[$match]); + return HTML::raw($this->_entities[$match]); } } @@ -1178,7 +1178,7 @@ function markup($match) { - return HTML::Raw($match); + return HTML::raw($match); } } @@ -1189,7 +1189,7 @@ function markup($match) { - return HTML::Raw($match); + return HTML::raw($match); } } Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/PageList.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1834,7 +1834,7 @@ // comma=1 // Condense list without a href links: "Page1, Page2, ..." - // Alternative $seperator = HTML::Raw(' · ') + // Alternative $seperator = HTML::raw(' · ') // FIXME: only unique list entries, esp. with nopage private function generateCommaListAsString() { Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/WikiTheme.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1585,7 +1585,7 @@ function initDoubleClickEdit() { if (!$this->HTML_DUMP_SUFFIX) - $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); + $this->addMoreAttr('body', 'DoubleClickEdit', HTML::raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); } // Immediate title search results via XMLHTML(HttpRequest) @@ -1597,7 +1597,7 @@ static $already = 0; if (!$this->HTML_DUMP_SUFFIX and !$already) { $this->addMoreAttr('body', 'LiveSearch', - HTML::Raw(" onload=\"liveSearchInit()")); + HTML::raw(" onload=\"liveSearchInit()")); $this->addMoreHeaders(JavaScript('var liveSearchURI="' . WikiURL(_("TitleSearch"), array(), true) . '";')); $this->addMoreHeaders(JavaScript('', array @@ -1977,7 +1977,7 @@ $page_content = $revision->getTransformedContent(); //$cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::Raw('· '); + $sp = HTML::raw('· '); foreach ($page_content->getWikiPageLinks() as $link) { $linkto = $link['linkto']; if (!$request->_dbi->isWikiPage($linkto)) continue; @@ -2002,7 +2002,7 @@ $page = $request->getPage($request->getArg('pagename')); $cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::Raw('· '); + $sp = HTML::raw('· '); foreach ($cache->getWikiPageLinks() as $link) { $linkto = $link['linkto']; if ($linkto) { Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/loadsave.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1070,7 +1070,7 @@ HiddenInputs($request->getArgs(), false, array('verify')), HiddenInputs(array('verify' => 1)), Button('submit:verify', _("Yes"), 'button'), - HTML::Raw(' '), + HTML::raw(' '), Button('submit:cancel', _("Cancel"), 'button')) ); $rev = $page->getRevision($version); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/stdlib.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -321,7 +321,7 @@ $prefix = false; } $text = HTML::span(array('style' => 'white-space: nowrap'), - $last_word, HTML::Raw(' '), $icon); + $last_word, HTML::raw(' '), $icon); if ($prefix) $text = HTML($prefix, $text); return $text; Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/wikilens/RatingsDb.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -318,7 +318,7 @@ } if (defined('RATING_EXTERNAL') and RATING_EXTERNAL) { // how call mysuggest.exe? as CGI or natively - //$rating = HTML::Raw("<!--#include virtual=".RATING_ENGINE." -->"); + //$rating = HTML::raw("<!--#include virtual=".RATING_ENGINE." -->"); $args = "-u$user -p$page -malpha"; // --top 10 if (isset($dimension)) $args .= " -d$dimension"; Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/MonoBook/templates/signin.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -1,5 +1,5 @@ <?php // On MonoBook we do away with only GET urls, no form. - $sp = HTML::Raw(" "); $id = $user->UserName(); + $sp = HTML::raw(" "); $id = $user->UserName(); ?> <div class="portlet" id="p-personal"><div class="pBody"> <ul> Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/MonoBook/themeinfo.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -82,7 +82,7 @@ { $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '" . $this->_name . "';\n")); $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikibits.js")))); - $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); + $this->addMoreAttr('body', "class-ns-0", HTML::raw('class="ns-0"')); // CSS file defines fonts, colors and background images for this // style. The companion '*-heavy.css' file isn't defined, it's just Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -31,7 +31,7 @@ <div class="pBody"> <?php echo Template("search", array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/, - 'SEARCH_AFTER' => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> + 'SEARCH_AFTER' => HTML::raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> </div> </div> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/templates/signin.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -1,12 +1,12 @@ <div class="portlet" id="p-personal"><div class="pBody"><ul> <?php if ($user->isAuthenticated()) { - $sp = HTML::Raw(" "); $id = $user->getAuthenticatedId(); ?> + $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li> <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> <?php } elseif (ALLOW_ANON_USER) { - $sp = HTML::Raw(" "); $id = $user->getAuthenticatedId(); + $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <?php } ?> Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/themeinfo.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -104,7 +104,7 @@ { // hack for navbar.tmpl to hide the buttonseparator if ($name == "navbar") { - $this->setButtonSeparator(HTML::Raw("<br />\n · ")); + $this->setButtonSeparator(HTML::raw("<br />\n · ")); } if ($name == "actionbar" || $name == "signin") { $this->setButtonSeparator(" "); Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/wikilens/templates/body.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -17,7 +17,7 @@ <h1><?php echo $HEADER ?> <?php if (!empty($user) && $user->isSignedIn()) { $loader = new WikiPluginLoader(); - printXML(HTML::Raw(" ")); + printXML(HTML::raw(" ")); printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); } ?> </h1> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-20 13:41:50
|
Revision: 9485 http://sourceforge.net/p/phpwiki/code/9485 Author: vargenau Date: 2015-01-20 13:41:47 +0000 (Tue, 20 Jan 2015) Log Message: ----------- Make credentials a string Modified Paths: -------------- trunk/PhpWiki.wsdl trunk/SOAP.php Modified: trunk/PhpWiki.wsdl =================================================================== --- trunk/PhpWiki.wsdl 2015-01-19 16:20:47 UTC (rev 9484) +++ trunk/PhpWiki.wsdl 2015-01-20 13:41:47 UTC (rev 9485) @@ -9,12 +9,12 @@ <message name="getPageContent"> <part name="pagename" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getPageRevision"> <part name="pagename" type="xsd:string"/> <part name="revision" type="xsd:double"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getPageContentResponse"> <part name="content" type="xsd:string"/> @@ -22,7 +22,7 @@ <message name="getCurrentRevision"> <part name="pagename" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getRevisionResponse"> <part name="revision" type="xsd:double"/> @@ -30,7 +30,7 @@ <message name="getPageMeta"> <part name="pagename" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getPageMetaResponse"> <part name="meta" type="typens:PageMetadata"/> @@ -38,59 +38,59 @@ <message name="doSavePage"> <part name="pagename" type="xsd:string"/> <part name="content" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="doSavePageResponse"> <part name="successcode" type="xsd:int"/> </message> <message name="getAllPagenames"> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getBackLinks"> <part name="pagename" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="doTitleSearch"> <part name="query" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="doFullTextSearch"> <part name="query" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getRecentChanges"> <part name="limit" type="xsd:int"/> <part name="since" type="xsd:int"/> <part name="include_minor" type="xsd:int"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="listLinks"> <part name="pagename" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="listPlugins"> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="callPlugin"> <part name="pluginname" type="xsd:string"/> <part name="pluginargs" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="getPluginSynopsis"> <part name="pluginname" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="listRelations"> <part name="option" type="xsd:int"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="linkSearch"> <part name="linktype" type="xsd:string"/> <part name="search" type="xsd:string"/> <part name="pages" type="xsd:string"/> <part name="relation" type="xsd:string"/> - <part name="credentials" type="typens:Credentials"/> + <part name="credentials" type="xsd:string"/> </message> <message name="PagenameListResponse"> @@ -133,12 +133,6 @@ <part name="version" type="xsd:int"/> </xsd:all> </xsd:complexType> - <xsd:complexType name="Credentials"> - <xsd:all> - <xsd:element name="username" type="xsd:string"/> - <xsd:element name="password" type="xsd:string"/> - </xsd:all> - </xsd:complexType> <xsd:complexType name="PageMetadata"> <xsd:all> <xsd:element name="createdby" type="xsd:string"/> Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2015-01-19 16:20:47 UTC (rev 9484) +++ trunk/SOAP.php 2015-01-20 13:41:47 UTC (rev 9485) @@ -26,32 +26,40 @@ function checkCredentials(&$server, &$credentials, $access, $pagename) { - /* - // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header - if (isset($server->header['Authorization'])) { - $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization']))); - list($credentials['username'], $credentials['password']) = explode(':', $line); - } else { - if (!isset($_SERVER)) - $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; + // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header + if (isset($server->header['Authorization'])) { + $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization']))); + list($username, $password) = explode(':', $line); + } elseif ($credentials && is_string($credentials) && base64_decode($credentials, true)) { + list($username, $password) = explode(':', base64_decode($credentials)); + } else { + if (!isset($_SERVER)) + $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; // TODO: where in the header is the client IP - if (!isset($credentials['username'])) { + if (!isset($username)) { if (isset($_SERVER['REMOTE_ADDR'])) - $credentials['username'] = $_SERVER['REMOTE_ADDR']; + $username = $_SERVER['REMOTE_ADDR']; elseif (isset($GLOBALS['REMOTE_ADDR'])) - $credentials['username'] = $GLOBALS['REMOTE_ADDR']; else - $credentials['username'] = $server->host; + $username = $GLOBALS['REMOTE_ADDR']; + else + $username = $server->host; } - } - if (!isset($credentials['password'])) $credentials['password'] = ''; + } + if (!isset($password)) + $password = ''; - global $request; - $request->_user = WikiUser($credentials['username']); - $request->_user->AuthCheck(array('userid' => $credentials['username'], - 'passwd' => $credentials['password'])); - if (!mayAccessPage($access, $pagename)) - $server->fault(401, '', "no permission"); - */ + global $request; + $request->_user = WikiUser($username); + $request->_user->AuthCheck(array('userid' => $username, 'passwd' => $password)); + + if (!mayAccessPage($access, $pagename)) { + $server->fault(401, "no permission, " + . "access=$access, " + . "pagename=$pagename, " + . "username=$username, " + ); + } + $credentials = array('username' => $username, 'password' => $password); } class PhpWikiSoapServer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-22 14:55:01
|
Revision: 9488 http://sourceforge.net/p/phpwiki/code/9488 Author: vargenau Date: 2015-01-22 14:54:52 +0000 (Thu, 22 Jan 2015) Log Message: ----------- Add soapscripts Added Paths: ----------- trunk/soapscripts/ trunk/soapscripts/README trunk/soapscripts/createpage trunk/soapscripts/createpagefromfile trunk/soapscripts/fulltextsearch trunk/soapscripts/getallpagenames trunk/soapscripts/getcurrentrevision trunk/soapscripts/getpage trunk/soapscripts/getpagemeta trunk/soapscripts/getpagerevision trunk/soapscripts/getpluginsynopsis trunk/soapscripts/listlinks trunk/soapscripts/listplugins trunk/soapscripts/listrelations trunk/soapscripts/recentchanges trunk/soapscripts/replacestring trunk/soapscripts/titlesearch Added: trunk/soapscripts/README =================================================================== --- trunk/soapscripts/README (rev 0) +++ trunk/soapscripts/README 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,16 @@ +The following scripts are available as examples of SOAP use: +* createpage +* createpagefromfile +* fulltextsearch +* getallpagenames +* getcurrentrevision +* getpage +* getpagemeta +* getpagerevision +* getpluginsynopsis +* listlinks +* listplugins +* listrelations +* recentchanges +* replacestring +* titlesearch Added: trunk/soapscripts/createpage =================================================================== --- trunk/soapscripts/createpage (rev 0) +++ trunk/soapscripts/createpage 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,33 @@ +#!/usr/bin/php +<?php +if (count($argv) != 3) { + echo "usage: $argv[0] pagename content\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->doSavePage($argv[1], $argv[2], $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/createpage ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/createpagefromfile =================================================================== --- trunk/soapscripts/createpagefromfile (rev 0) +++ trunk/soapscripts/createpagefromfile 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,43 @@ +#!/usr/bin/php +<?php +if (count($argv) != 3) { + echo "usage: $argv[0] pagename filename\n"; + exit; +} + +if (!file_exists($argv[2])) { + echo "error: file $argv[2] does not exist\n"; + exit; +} + +if (!is_readable($argv[2])) { + echo "error: file $argv[2] is not readable\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->doSavePage($argv[1], file_get_contents($argv[2]), $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/createpagefromfile ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/fulltextsearch =================================================================== --- trunk/soapscripts/fulltextsearch (rev 0) +++ trunk/soapscripts/fulltextsearch 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,35 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] term-to-search\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $pages = $client->doFullTextSearch($argv[1], $credentials); + foreach ($pages as $page) { + echo $page['pagename']."\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/fulltextsearch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getallpagenames =================================================================== --- trunk/soapscripts/getallpagenames (rev 0) +++ trunk/soapscripts/getallpagenames 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,36 @@ +#!/usr/bin/php +<?php +if (count($argv) != 1) { + echo "usage: $argv[0]\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $all_pages = $client->getAllPagenames($argv[1]); + for ($i = 0; $i < count($all_pages); $i++) { + echo $all_pages[$i]['pagename']; + echo "\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getallpagenames ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getcurrentrevision =================================================================== --- trunk/soapscripts/getcurrentrevision (rev 0) +++ trunk/soapscripts/getcurrentrevision 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,33 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] pagename\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->getCurrentRevision($argv[1], $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getcurrentrevision ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getpage =================================================================== --- trunk/soapscripts/getpage (rev 0) +++ trunk/soapscripts/getpage 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,33 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] pagename\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->getPageContent($argv[1], $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getpage ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getpagemeta =================================================================== --- trunk/soapscripts/getpagemeta (rev 0) +++ trunk/soapscripts/getpagemeta 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,35 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] pagename\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $pagemeta = $client->getPageMeta($argv[1], $credentials); + foreach ($pagemeta as $key => $value) { + echo "$key: $value\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getpagemeta ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getpagerevision =================================================================== --- trunk/soapscripts/getpagerevision (rev 0) +++ trunk/soapscripts/getpagerevision 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,37 @@ +#!/usr/bin/php +<?php +if (count($argv) != 3) { + echo "usage: $argv[0] pagename revision\n"; + exit; +} +if (!is_numeric($argv[2])) { + echo "usage: revision must be an integer\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->getPageRevision($argv[1], $argv[2], $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getpagerevision ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/getpluginsynopsis =================================================================== --- trunk/soapscripts/getpluginsynopsis (rev 0) +++ trunk/soapscripts/getpluginsynopsis 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,33 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] plugin-name\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + echo $client->getPluginSynopsis($argv[1], $credentials); + echo "\n"; +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/getpluginsynopsis ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/listlinks =================================================================== --- trunk/soapscripts/listlinks (rev 0) +++ trunk/soapscripts/listlinks 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,35 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] pagename\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $links = $client->listLinks($argv[1], $credentials); + foreach ($links as $link) { + echo $link['pagename']."\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/listlinks ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/listplugins =================================================================== --- trunk/soapscripts/listplugins (rev 0) +++ trunk/soapscripts/listplugins 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,36 @@ +#!/usr/bin/php +<?php +if (count($argv) != 1) { + echo "usage: $argv[0]\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $plugins = $client->listPlugins($credentials); + for ($i = 0; $i < count($plugins); $i++) { + echo $plugins[$i]; + echo "\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/listplugins ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/listrelations =================================================================== --- trunk/soapscripts/listrelations (rev 0) +++ trunk/soapscripts/listrelations 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,36 @@ +#!/usr/bin/php +<?php +if (count($argv) != 1) { + echo "usage: $argv[0]\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $relations = $client->listRelations($credentials); + for ($i = 0; $i < count($relations); $i++) { + echo $relations[$i]; + echo "\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/listrelations ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/recentchanges =================================================================== --- trunk/soapscripts/recentchanges (rev 0) +++ trunk/soapscripts/recentchanges 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,45 @@ +#!/usr/bin/php +<?php +if (count($argv) == 1) { + $limit = 20; +} elseif (count($argv) == 2) { + $limit = $argv[0]; +} else { + echo "usage: $argv[0] [limit]\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $changes = $client->getRecentChanges($limit, $credentials); + foreach ($changes as $change) { + echo "Pagename: ".$change['pagename']."\n"; + echo "Last modified: ".$change['lastModified']."\n"; + echo "Author: ".$change['author']."\n"; + echo "Summary: ".$change['summary']."\n"; + echo "Version: ".$change['version']."\n"; + echo "\n"; + } + +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/recentchanges ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/replacestring =================================================================== --- trunk/soapscripts/replacestring (rev 0) +++ trunk/soapscripts/replacestring 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,37 @@ +#!/usr/bin/php +<?php +if (count($argv) != 4) { + echo "usage: $argv[0] pagename search replace\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $old_content = $client->getPageContent($argv[1], $credentials); + $new_content = str_replace($argv[2], $argv[3], $old_content); + if ($new_content != $old_content) { + echo $client->doSavePage($argv[1], $new_content, $credentials); + echo "\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/replacestring ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/soapscripts/titlesearch =================================================================== --- trunk/soapscripts/titlesearch (rev 0) +++ trunk/soapscripts/titlesearch 2015-01-22 14:54:52 UTC (rev 9488) @@ -0,0 +1,35 @@ +#!/usr/bin/php +<?php +if (count($argv) != 2) { + echo "usage: $argv[0] term-to-search\n"; + exit; +} + +try { + $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"); +} catch (SoapFault $fault) { + die($fault->faultstring); +} + +$phpwiki = getenv("HOME")."/.phpwiki"; +if (!file_exists($phpwiki)) { + $login = readline("Login: "); + $password = readline("Password: "); + $credentials = base64_encode($login.':'.$password); + if ($fp = fopen($phpwiki, 'w')) { + fprintf($fp, "%s:%s\n", $login, $password); + fclose($fp); + chmod($phpwiki, 0600); + } +} else { + $credentials = base64_encode(file_get_contents($phpwiki)); +} + +try { + $pages = $client->doTitleSearch($argv[1], $credentials); + foreach ($pages as $page) { + echo $page['pagename']."\n"; + } +} catch (SoapFault $e) { + echo 'Error: ' . $e->getMessage() . "\n"; +} Property changes on: trunk/soapscripts/titlesearch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-26 16:40:26
|
Revision: 9490 http://sourceforge.net/p/phpwiki/code/9490 Author: vargenau Date: 2015-01-26 16:40:23 +0000 (Mon, 26 Jan 2015) Log Message: ----------- PageHistory: by default, limit number of versions to display to 100 Modified Paths: -------------- trunk/lib/plugin/PageHistory.php trunk/pgsrc/Help%2FPageHistoryPlugin trunk/soapscripts/createpage trunk/soapscripts/createpagefromfile trunk/soapscripts/fulltextsearch trunk/soapscripts/getallpagenames trunk/soapscripts/getcurrentrevision trunk/soapscripts/getpage trunk/soapscripts/getpagemeta trunk/soapscripts/getpagerevision trunk/soapscripts/getpluginsynopsis trunk/soapscripts/listlinks trunk/soapscripts/listplugins trunk/soapscripts/listrelations trunk/soapscripts/recentchanges trunk/soapscripts/replacestring trunk/soapscripts/titlesearch Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/lib/plugin/PageHistory.php 2015-01-26 16:40:23 UTC (rev 9490) @@ -27,7 +27,7 @@ { public $_itemcount; - function _PageHistory_PageRevisionIter($rev_iter, $params) + function __construct($rev_iter, $params) { $this->_iter = $rev_iter; @@ -284,7 +284,7 @@ return array('days' => false, 'show_minor' => true, 'show_major' => true, - 'limit' => 0, + 'limit' => 100, 'page' => '[pagename]', 'format' => false); } Modified: trunk/pgsrc/Help%2FPageHistoryPlugin =================================================================== --- trunk/pgsrc/Help%2FPageHistoryPlugin 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/pgsrc/Help%2FPageHistoryPlugin 2015-01-26 16:40:23 UTC (rev 9490) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:57 +0000 +Date: Mon, 26 Jan 2015 17:36:01 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Help%2FPageHistoryPlugin; @@ -38,8 +38,8 @@ | true |- | **limit** -| -| +| Number of versions to display +| 100 |- | **format** | Modified: trunk/soapscripts/createpage =================================================================== --- trunk/soapscripts/createpage 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/createpage 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/createpagefromfile =================================================================== --- trunk/soapscripts/createpagefromfile 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/createpagefromfile 2015-01-26 16:40:23 UTC (rev 9490) @@ -27,7 +27,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/fulltextsearch =================================================================== --- trunk/soapscripts/fulltextsearch 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/fulltextsearch 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getallpagenames =================================================================== --- trunk/soapscripts/getallpagenames 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getallpagenames 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getcurrentrevision =================================================================== --- trunk/soapscripts/getcurrentrevision 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getcurrentrevision 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getpage =================================================================== --- trunk/soapscripts/getpage 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getpage 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getpagemeta =================================================================== --- trunk/soapscripts/getpagemeta 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getpagemeta 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getpagerevision =================================================================== --- trunk/soapscripts/getpagerevision 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getpagerevision 2015-01-26 16:40:23 UTC (rev 9490) @@ -21,7 +21,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/getpluginsynopsis =================================================================== --- trunk/soapscripts/getpluginsynopsis 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/getpluginsynopsis 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/listlinks =================================================================== --- trunk/soapscripts/listlinks 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/listlinks 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/listplugins =================================================================== --- trunk/soapscripts/listplugins 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/listplugins 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/listrelations =================================================================== --- trunk/soapscripts/listrelations 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/listrelations 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/recentchanges =================================================================== --- trunk/soapscripts/recentchanges 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/recentchanges 2015-01-26 16:40:23 UTC (rev 9490) @@ -21,7 +21,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/replacestring =================================================================== --- trunk/soapscripts/replacestring 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/replacestring 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } Modified: trunk/soapscripts/titlesearch =================================================================== --- trunk/soapscripts/titlesearch 2015-01-26 13:05:02 UTC (rev 9489) +++ trunk/soapscripts/titlesearch 2015-01-26 16:40:23 UTC (rev 9490) @@ -17,7 +17,7 @@ $password = readline("Password: "); $credentials = base64_encode($login.':'.$password); if ($fp = fopen($phpwiki, 'w')) { - fprintf($fp, "%s:%s\n", $login, $password); + fprintf($fp, "%s:%s", $login, $password); fclose($fp); chmod($phpwiki, 0600); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-04 15:33:43
|
Revision: 9508 http://sourceforge.net/p/phpwiki/code/9508 Author: vargenau Date: 2015-02-04 15:33:42 +0000 (Wed, 04 Feb 2015) Log Message: ----------- Remove TWIG Removed Paths: ------------- trunk/composer.json trunk/composer.lock trunk/vendor/ Deleted: trunk/composer.json =================================================================== --- trunk/composer.json 2015-02-04 15:29:17 UTC (rev 9507) +++ trunk/composer.json 2015-02-04 15:33:42 UTC (rev 9508) @@ -1,5 +0,0 @@ -{ - "require": { - "twig/twig": "~1.0" - } -} Deleted: trunk/composer.lock =================================================================== --- trunk/composer.lock 2015-02-04 15:29:17 UTC (rev 9507) +++ trunk/composer.lock 2015-02-04 15:33:42 UTC (rev 9508) @@ -1,75 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "hash": "a31e651ea26a527432562441b3545e0a", - "packages": [ - { - "name": "twig/twig", - "version": "v1.16.2", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc", - "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.16-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fa...@sy...", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Armin Ronacher", - "email": "arm...@ac...", - "role": "Project Founder" - }, - { - "name": "Twig Team", - "homepage": "https://github.com/fabpot/Twig/graphs/contributors", - "role": "Contributors" - } - ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ], - "time": "2014-10-17 12:53:44" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [] -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-04 17:02:40
|
Revision: 9509 http://sourceforge.net/p/phpwiki/code/9509 Author: vargenau Date: 2015-02-04 17:02:30 +0000 (Wed, 04 Feb 2015) Log Message: ----------- Use PHP ZIP class instead of home-made functions Modified Paths: -------------- trunk/lib/loadsave.php trunk/lib/plugin/CreateBib.php trunk/locale/Makefile trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/pgsrc/ReleaseNotes Added Paths: ----------- trunk/lib/mimelib.php Removed Paths: ------------- trunk/lib/ziplib.php Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/lib/loadsave.php 2015-02-04 17:02:30 UTC (rev 9509) @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once 'lib/ziplib.php'; +require_once 'lib/mimelib.php'; require_once 'lib/Template.php'; /** @@ -233,7 +233,16 @@ // We may need much memory for the dump ini_set("memory_limit", -1); - $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname); + $zip = new ZipArchive(); + $tmpfilename = "/tmp/" . $zipname; + if (file_exists($tmpfilename)) { + unlink ($tmpfilename); + } + if ($zip->open($tmpfilename, ZipArchive::CREATE) !== true) { + trigger_error(_("Cannot create ZIP archive"), E_USER_ERROR); + return; + } + $zip->setArchiveComment(sprintf(_("Created by PhpWiki %s"), PHPWIKI_VERSION)); /* ignore fatals in plugins */ $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler')); @@ -281,11 +290,18 @@ else $content = MailifyPage($page); - $zip->addRegularFile(FilenameForPage($pagename), $content, $attrib); + $zip->addFromString(FilenameForPage($pagename), $content); } - $zip->finish(); + $zip->close(); $ErrorManager->popErrorHandler(); + + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="'.$zipname.'"'); + header('Content-Length: '.filesize($tmpfilename)); + + readfile($tmpfilename); + exit; } function DumpToDir(&$request) @@ -493,7 +509,16 @@ // We may need much memory for the dump ini_set("memory_limit", -1); - $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname); + $zip = new ZipArchive(); + $tmpfilename = "/tmp/" . $zipname; + if (file_exists($tmpfilename)) { + unlink ($tmpfilename); + } + if ($zip->open($tmpfilename, ZipArchive::CREATE) !== true) { + trigger_error(_("Cannot create ZIP archive"), E_USER_ERROR); + return; + } + $zip->setArchiveComment(sprintf(_("Created by PhpWiki %s"), PHPWIKI_VERSION)); $dbi =& $request->_dbi; $thispage = $request->getArg('pagename'); // for "Return to ..." @@ -506,14 +531,14 @@ } $WikiTheme->DUMP_MODE = 'ZIPHTML'; - _DumpHtmlToDir($zip, $page_iter, $request->getArg('exclude')); + _DumpHtmlToDir($zip, $page_iter, $request->getArg('exclude'), $zipname, $tmpfilename); $WikiTheme->DUMP_MODE = false; } /* * Internal html dumper. Used for dumphtml, ziphtml and pdf */ -function _DumpHtmlToDir($target, $page_iter, $exclude = false) +function _DumpHtmlToDir($target, $page_iter, $exclude = false, $zipname='', $tmpfilename='') { global $WikiTheme, $request, $ErrorManager; $silent = true; @@ -677,7 +702,7 @@ } } else { $target = "images/$base"; - $zip->addSrcFile($target, $src); + $zip->addFile($src); } } } @@ -708,7 +733,7 @@ fclose($fd); $outfiles[] = $outfile; } else { - $zip->addRegularFile($filename, $data, $attrib); + $zip->addFromString($filename, $data); } if (USECACHE) { @@ -826,9 +851,19 @@ } } - if ($zip) - $zip->finish(); + if ($zip) { + $zip->close(); + $ErrorManager->popErrorHandler(); + + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="'.$zipname.'"'); + header('Content-Length: '.filesize($tmpfilename)); + + readfile($tmpfilename); + exit; + } + if ($WikiTheme->DUMP_MODE == 'PDFHTML') { if (USE_EXTERNAL_HTML2PDF and $outfiles) { $cmd = EXTERNAL_HTML2PDF_PAGELIST . ' "' . join('" "', $outfiles) . '"'; @@ -1236,21 +1271,21 @@ $text = implode("", file($filename)); } - if (!$request->getArg('start_debug')) @set_time_limit(30); // Reset watchdog - else @set_time_limit(240); - // FIXME: basename("filewithnoslashes") seems to return garbage sometimes. $basename = basename("/dummy/" . $filename); $default_pagename = rawurldecode($basename); + if (($parts = ParseMimeifiedPages($text))) { - if (count($parts) > 1) + if (count($parts) > 1) { $overwrite = $request->getArg('overwrite'); + } usort($parts, 'SortByPageVersion'); foreach ($parts as $pageinfo) { // force overwrite - if (count($parts) > 1) + if (count($parts) > 1) { $request->setArg('overwrite', 1); + } SavePage($request, $pageinfo, sprintf(_("MIME file %s"), $filename)); } if (count($parts) > 1) @@ -1280,9 +1315,18 @@ function LoadZip(&$request, $zipfile, $files = array(), $exclude = array()) { - $zip = new ZipReader($zipfile); + $zip = new ZipArchive(); + $res = $zip->open($zipfile); + if ($res !== true) { + trigger_error(_("Cannot open ZIP archive for reading"), E_USER_ERROR); + return; + } $timeout = (!$request->getArg('start_debug')) ? 20 : 120; - while (list ($fn, $data, $attrib) = $zip->readFile()) { + + for ($i = 0; $i < $zip->numFiles; $i++) { + $fn = $zip->getNameIndex($i); + $data = $zip->getFromIndex($i); + $attrib = array(); // FIXME: basename("filewithnoslashes") seems to return // garbage sometimes. $fn = basename("/dummy/" . $fn); @@ -1294,9 +1338,9 @@ flush(); continue; } - longer_timeout($timeout); // longer timeout per page LoadFile($request, $fn, $data); } + $zip->close(); } function LoadDir(&$request, $dirname, $files = array(), $exclude = array()) @@ -1357,6 +1401,9 @@ } } +define('ZIP_CENTHEAD_MAGIC', "PK\001\002"); +define('ZIP_LOCHEAD_MAGIC', "PK\003\004"); + function IsZipFile($filename_or_fd) { // See if it looks like zip file @@ -1521,7 +1568,7 @@ $fd = $upload->open(); if (IsZipFile($fd)) - LoadZip($request, $fd, array(), array(_("RecentChanges"))); + LoadZip($request, $upload->getTmpName(), array(), array(_("RecentChanges"))); else LoadFile($request, $upload->getName(), $upload->getContents()); Copied: trunk/lib/mimelib.php (from rev 9508, trunk/lib/ziplib.php) =================================================================== --- trunk/lib/mimelib.php (rev 0) +++ trunk/lib/mimelib.php 2015-02-04 17:02:30 UTC (rev 9509) @@ -0,0 +1,397 @@ +<?php + +/** + * Routines for Mime mailification of pages. + */ + +/** + * Routines for quoted-printable en/decoding. + */ +function QuotedPrintableEncode($string) +{ + // Quote special characters in line. + $quoted = ""; + while ($string) { + // The complicated regexp is to force quoting of trailing spaces. + preg_match('/^([ !-<>-~]*)(?:([!-<>-~]$)|(.))/s', $string, $match); + $quoted .= $match[1] . $match[2]; + if (!empty($match[3])) + $quoted .= sprintf("=%02X", ord($match[3])); + $string = substr($string, strlen($match[0])); + } + // Split line. + // This splits the line (preferably after white-space) into lines + // which are no longer than 76 chars (after adding trailing '=' for + // soft line break, but before adding \r\n.) + return preg_replace('/(?=.{77})(.{10,74}[ \t]|.{71,73}[^=][^=])/s', + "\\1=\r\n", $quoted); +} + +function QuotedPrintableDecode($string) +{ + // Eliminate soft line-breaks. + $string = preg_replace('/=[ \t\r]*\n/', '', $string); + return quoted_printable_decode($string); +} + +define('MIME_TOKEN_REGEXP', "[-!#-'*+.0-9A-Z^-~]+"); + +function MimeContentTypeHeader($type, $subtype, $params) +{ + $header = "Content-Type: $type/$subtype"; + reset($params); + while (list($key, $val) = each($params)) { + //FIXME: what about non-ascii printables in $val? + if (!preg_match('/^' . MIME_TOKEN_REGEXP . '$/', $val)) + $val = '"' . addslashes($val) . '"'; + $header .= ";\r\n $key=$val"; + } + return "$header\r\n"; +} + +function MimeMultipart($parts) +{ + global $mime_multipart_count; + + // The string "=_" can not occur in quoted-printable encoded data. + $boundary = "=_multipart_boundary_" . ++$mime_multipart_count; + + $head = MimeContentTypeHeader('multipart', 'mixed', + array('boundary' => $boundary)); + + $sep = "\r\n--$boundary\r\n"; + + return $head . $sep . implode($sep, $parts) . "\r\n--${boundary}--\r\n"; +} + +/** + * For reference see: + * http://www.nacs.uci.edu/indiv/ehood/MIME/2045/rfc2045.html + * http://www.faqs.org/rfcs/rfc2045.html + * (RFC 1521 has been superceeded by RFC 2045 & others). + * + * Also see http://www.faqs.org/rfcs/rfc2822.html + * + * + * Notes on content-transfer-encoding. + * + * "7bit" means short lines of US-ASCII. + * "8bit" means short lines of octets with (possibly) the high-order bit set. + * "binary" means lines are not necessarily short enough for SMTP + * transport, and non-ASCII characters may be present. + * + * Only "7bit", "quoted-printable", and "base64" are universally safe + * for transport via e-mail. (Though many MTAs can/will be configured to + * automatically convert encodings to a safe type if they receive + * mail encoded in '8bit' and/or 'binary' encodings. + */ + +/** + * @param WikiDB_Page $page + * @param WikiDB_PageRevision $revision + * @return string + */ + +function MimeifyPageRevision(&$page, &$revision) +{ + // $wikidb =& $revision->_wikidb; + // $page = $wikidb->getPage($revision->getName()); + // FIXME: add 'hits' to $params + $params = array('pagename' => $page->getName(), + 'flags' => "", + 'author' => $revision->get('author'), + 'owner' => $page->getOwner(), + 'version' => $revision->getVersion(), + 'lastmodified' => $revision->get('mtime')); + + if ($page->get('mtime')) + $params['created'] = $page->get('mtime'); + if ($page->get('locked')) + $params['flags'] = 'PAGE_LOCKED'; + if (ENABLE_EXTERNAL_PAGES && $page->get('external')) + $params['flags'] = ($params['flags'] ? $params['flags'] . ',EXTERNAL_PAGE' : 'EXTERNAL_PAGE'); + if ($revision->get('author_id')) + $params['author_id'] = $revision->get('author_id'); + if ($revision->get('summary')) + $params['summary'] = $revision->get('summary'); + if ($page->get('hits')) + $params['hits'] = $page->get('hits'); + if ($page->get('owner')) + $params['owner'] = $page->get('owner'); + if ($page->get('perm') and class_exists('PagePermission')) { + $acl = getPagePermissions($page); + $params['acl'] = $acl->asAclLines(); + //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,... + } + + // Non-US-ASCII is not allowed in Mime headers (at least not without + // special handling) --- so we urlencode all parameter values. + foreach ($params as $key => $val) + $params[$key] = rawurlencode($val); + if (isset($params['acl'])) + // default: "view:_EVERY; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; ". + // "list:_EVERY; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY; " + $params['acl'] = str_replace(array("%3A", "%3B%20", "%2C"), array(":", "; ", ","), $params['acl']); + + $out = MimeContentTypeHeader('application', 'x-phpwiki', $params); + $out .= sprintf("Content-Transfer-Encoding: %s\r\n", + STRICT_MAILABLE_PAGEDUMPS ? 'quoted-printable' : 'binary'); + + $out .= "\r\n"; + + foreach ($revision->getContent() as $line) { + // This is a dirty hack to allow saving binary text files. See above. + $line = rtrim($line); + if (STRICT_MAILABLE_PAGEDUMPS) + $line = QuotedPrintableEncode(rtrim($line)); + $out .= "$line\r\n"; + } + return $out; +} + +/** + * Routines for parsing Mime-ified phpwiki pages. + */ +function ParseRFC822Headers(&$string) +{ + if (preg_match("/^From (.*)\r?\n/", $string, $match)) { + $headers['from '] = preg_replace('/^\s+|\s+$/', '', $match[1]); + $string = substr($string, strlen($match[0])); + } + + while (preg_match('/^([!-9;-~]+) [ \t]* : [ \t]* ' + . '( .* \r?\n (?: [ \t] .* \r?\n)* )/x', + $string, $match)) { + $headers[strtolower($match[1])] + = preg_replace('/^\s+|\s+$/', '', $match[2]); + $string = substr($string, strlen($match[0])); + } + + if (empty($headers)) + return false; + + if (strlen($string) > 0) { + if (!preg_match("/^\r?\n/", $string, $match)) { + // No blank line after headers. + return false; + } + $string = substr($string, strlen($match[0])); + } + + return $headers; +} + +function ParseMimeContentType($string) +{ + // FIXME: Remove (RFC822 style comments). + + // Get type/subtype + if (!preg_match(':^\s*(' . MIME_TOKEN_REGEXP . ')\s*' + . '/' + . '\s*(' . MIME_TOKEN_REGEXP . ')\s*:x', + $string, $match) + ) + ExitWiki(sprintf("Bad %s", 'MIME content-type')); + + $type = strtolower($match[1]); + $subtype = strtolower($match[2]); + $string = substr($string, strlen($match[0])); + + $param = array(); + while (preg_match('/^;\s*(' . MIME_TOKEN_REGEXP . ')\s*=\s*' + . '(?:(' . MIME_TOKEN_REGEXP . ')|"((?:[^"\\\\]|\\.)*)") \s*/sx', + $string, $match)) { + //" <--kludge for brain-dead syntax coloring + if (strlen($match[2])) + $val = $match[2]; + else + $val = preg_replace('/[\\\\](.)/s', '\\1', $match[3]); + + $param[strtolower($match[1])] = $val; + + $string = substr($string, strlen($match[0])); + } + + return array($type, $subtype, $param); +} + +function ParseMimeMultipart($data, $boundary) +{ + if (!$boundary) { + ExitWiki("No boundary?"); + } + + $boundary = preg_quote($boundary); + + while (preg_match("/^(|.*?\n)--$boundary((?:--)?)[^\n]*\n/s", + $data, $match)) { + $data = substr($data, strlen($match[0])); + if (!isset($parts)) { + $parts = array(); // First time through: discard leading chaff + } else { + if ($content = ParseMimeifiedPages($match[1])) + for (reset($content); $p = current($content); next($content)) + $parts[] = $p; + } + + if ($match[2]) + return $parts; // End boundary found. + } + ExitWiki("No end boundary?"); +} + +function GenerateFootnotesFromRefs($params) +{ + $footnotes = array(); + reset($params); + while (list($p, $reference) = each($params)) { + if (preg_match('/^ref([1-9][0-9]*)$/', $p, $m)) + $footnotes[$m[1]] = sprintf(_("[%d] See [%s]"), + $m[1], rawurldecode($reference)); + } + + if (sizeof($footnotes) > 0) { + ksort($footnotes); + return "-----\n" + . "!" . _("References") . "\n" + . join("\n%%%\n", $footnotes) . "\n"; + } else + return ""; +} + +// counterpart to $acl->asAclLines() and rawurl undecode +// default: "view:_EVERY; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; ". +// "list:_EVERY; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY; " +function ParseMimeifiedPerm($string) +{ + if (!class_exists('PagePermission')) { + return ''; + } + $hash = array(); + foreach (explode(";", trim($string)) as $accessgroup) { + list($access, $groupstring) = explode(":", trim($accessgroup)); + $access = trim($access); + $groups = explode(",", trim($groupstring)); + foreach ($groups as $group) { + $group = trim($group); + $bool = (boolean)(substr($group, 0, 1) != '-'); + if (substr($group, 0, 1) == '-' or substr($group, 0, 1) == '+') + $group = substr($group, 1); + $hash[$access][$group] = $bool; + } + } + $perm = new PagePermission($hash); + $perm->sanify(); + return serialize($perm->perm); +} + +// Convert references in meta-data to footnotes. +// Only zip archives generated by phpwiki 1.2.x or earlier should have +// references. +function ParseMimeifiedPages($data) +{ + // We may need a lot of memory and time for the dump + ini_set("memory_limit", -1); + ini_set('max_execution_time', 0); + + if (!($headers = ParseRFC822Headers($data)) + || empty($headers['content-type']) + ) { + //trigger_error( sprintf(_("Can't find %s"),'content-type header'), + // E_USER_WARNING ); + return false; + } + $typeheader = $headers['content-type']; + + if (!(list ($type, $subtype, $params) = ParseMimeContentType($typeheader))) { + trigger_error(sprintf("Can't parse %s: (%s)", + 'content-type', $typeheader), + E_USER_WARNING); + return false; + } + if ("$type/$subtype" == 'multipart/mixed') { + return ParseMimeMultipart($data, $params['boundary']); + } elseif ("$type/$subtype" != 'application/x-phpwiki') { + trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"), + E_USER_WARNING); + return false; + } + + // FIXME: more sanity checking? + $page = array(); + $pagedata = array(); + $versiondata = array(); + if (isset($headers['date'])) + $pagedata['date'] = strtotime($headers['date']); + + //DONE: support owner and acl + foreach ($params as $key => $value) { + if (empty($value)) + continue; + $value = rawurldecode($value); + switch ($key) { + case 'pagename': + case 'version': + $page[$key] = $value; + break; + case 'flags': + if (preg_match('/PAGE_LOCKED/', $value)) + $pagedata['locked'] = 'yes'; + if (ENABLE_EXTERNAL_PAGES && preg_match('/EXTERNAL_PAGE/', $value)) + $pagedata['external'] = 'yes'; + break; + case 'owner': + case 'created': + case 'hits': + $pagedata[$key] = $value; + break; + case 'acl': + case 'perm': + if (class_exists('PagePermission')) { + $pagedata['perm'] = ParseMimeifiedPerm($value); + } + break; + case 'lastmodified': + $versiondata['mtime'] = $value; + break; + case 'author': + case 'author_id': + case 'summary': + case 'pagetype': + $versiondata[$key] = $value; + break; + } + } + + // FIXME: do we need to try harder to find a pagename if we + // haven't got one yet? + if (!isset($versiondata['author'])) { + global $request; + if (is_object($request)) { + $user = $request->getUser(); + $versiondata['author'] = $user->getId(); //FIXME:? + } + } + + $encoding = strtolower($headers['content-transfer-encoding']); + if ($encoding == 'quoted-printable') + $data = QuotedPrintableDecode($data); + else if ($encoding && $encoding != 'binary') + ExitWiki(sprintf("Unknown %s", 'encoding type: $encoding')); + + $data .= GenerateFootnotesFromRefs($params); + + $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data)); + $page['pagedata'] = $pagedata; + $page['versiondata'] = $versiondata; + + return array($page); +} + +// Local Variables: +// mode: php +// tab-width: 8 +// c-basic-offset: 4 +// c-hanging-comment-ender-p: nil +// indent-tabs-mode: nil +// End: Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/lib/plugin/CreateBib.php 2015-02-04 17:02:30 UTC (rev 9509) @@ -89,7 +89,9 @@ $attrib = array('mtime' => $thispage->get('mtime'), 'is_ascii' => 1); - $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $filename); + $zip = new ZipWriter($filename); + // $zip->setArchiveComment(sprintf(_("Created by PhpWiki %s"), PHPWIKI_VERSION)); + $zip->addRegularFile(FilenameForPage($thispage->getName()), $mailified, $attrib); $zip->finish(); Deleted: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/lib/ziplib.php 2015-02-04 17:02:30 UTC (rev 9509) @@ -1,813 +0,0 @@ -<?php - -/** - * GZIP stuff. - * - * Note that we use gzopen()/gzwrite() instead of gzcompress() even if - * gzcompress() is available. Gzcompress() puts out data with - * different headers --- in particular it includes an "adler-32" - * checksum rather than a "CRC32" checksum. Since we need the CRC-32 - * checksum, and since not all PHP's have gzcompress(), we'll just - * stick with gzopen(). - */ - -/** - * CRC32 computation. Hacked from Info-zip's zip-2.3 source code. - */ - -function zip_crc32($str, $crc = 0) -{ - static $zip_crc_table; - - if (empty($zip_crc_table)) { - /* NOTE: The range of PHP ints seems to be -0x80000000 to 0x7fffffff. - * So, had to munge these constants. - */ - $zip_crc_table - = array(0x00000000, 0x77073096, -0x11f19ed4, -0x66f6ae46, 0x076dc419, - 0x706af48f, -0x169c5acb, -0x619b6a5d, 0x0edb8832, 0x79dcb8a4, - -0x1f2a16e2, -0x682d2678, 0x09b64c2b, 0x7eb17cbd, -0x1847d2f9, - -0x6f40e26f, 0x1db71064, 0x6ab020f2, -0x0c468eb8, -0x7b41be22, - 0x1adad47d, 0x6ddde4eb, -0x0b2b4aaf, -0x7c2c7a39, 0x136c9856, - 0x646ba8c0, -0x029d0686, -0x759a3614, 0x14015c4f, 0x63066cd9, - -0x05f0c29d, -0x72f7f20b, 0x3b6e20c8, 0x4c69105e, -0x2a9fbe1c, - -0x5d988e8e, 0x3c03e4d1, 0x4b04d447, -0x2df27a03, -0x5af54a95, - 0x35b5a8fa, 0x42b2986c, -0x2444362a, -0x534306c0, 0x32d86ce3, - 0x45df5c75, -0x2329f231, -0x542ec2a7, 0x26d930ac, 0x51de003a, - -0x3728ae80, -0x402f9eea, 0x21b4f4b5, 0x56b3c423, -0x30456a67, - -0x47425af1, 0x2802b89e, 0x5f058808, -0x39f3264e, -0x4ef416dc, - 0x2f6f7c87, 0x58684c11, -0x3e9ee255, -0x4999d2c3, 0x76dc4190, - 0x01db7106, -0x672ddf44, -0x102aefd6, 0x71b18589, 0x06b6b51f, - -0x60401b5b, -0x17472bcd, 0x7807c9a2, 0x0f00f934, -0x69f65772, - -0x1ef167e8, 0x7f6a0dbb, 0x086d3d2d, -0x6e9b9369, -0x199ca3ff, - 0x6b6b51f4, 0x1c6c6162, -0x7a9acf28, -0x0d9dffb2, 0x6c0695ed, - 0x1b01a57b, -0x7df70b3f, -0x0af03ba9, 0x65b0d9c6, 0x12b7e950, - -0x74414716, -0x03467784, 0x62dd1ddf, 0x15da2d49, -0x732c830d, - -0x042bb39b, 0x4db26158, 0x3ab551ce, -0x5c43ff8c, -0x2b44cf1e, - 0x4adfa541, 0x3dd895d7, -0x5b2e3b93, -0x2c290b05, 0x4369e96a, - 0x346ed9fc, -0x529877ba, -0x259f4730, 0x44042d73, 0x33031de5, - -0x55f5b3a1, -0x22f28337, 0x5005713c, 0x270241aa, -0x41f4eff0, - -0x36f3df7a, 0x5768b525, 0x206f85b3, -0x46992bf7, -0x319e1b61, - 0x5edef90e, 0x29d9c998, -0x4f2f67de, -0x3828574c, 0x59b33d17, - 0x2eb40d81, -0x4842a3c5, -0x3f459353, -0x12477ce0, -0x65404c4a, - 0x03b6e20c, 0x74b1d29a, -0x152ab8c7, -0x622d8851, 0x04db2615, - 0x73dc1683, -0x1c9cf4ee, -0x6b9bc47c, 0x0d6d6a3e, 0x7a6a5aa8, - -0x1bf130f5, -0x6cf60063, 0x0a00ae27, 0x7d079eb1, -0x0ff06cbc, - -0x78f75c2e, 0x1e01f268, 0x6906c2fe, -0x089da8a3, -0x7f9a9835, - 0x196c3671, 0x6e6b06e7, -0x012be48a, -0x762cd420, 0x10da7a5a, - 0x67dd4acc, -0x06462091, -0x71411007, 0x17b7be43, 0x60b08ed5, - -0x29295c18, -0x5e2e6c82, 0x38d8c2c4, 0x4fdff252, -0x2e44980f, - -0x5943a899, 0x3fb506dd, 0x48b2364b, -0x27f2d426, -0x50f5e4b4, - 0x36034af6, 0x41047a60, -0x209f103d, -0x579820ab, 0x316e8eef, - 0x4669be79, -0x349e4c74, -0x43997ce6, 0x256fd2a0, 0x5268e236, - -0x33f3886b, -0x44f4b8fd, 0x220216b9, 0x5505262f, -0x3a45c442, - -0x4d42f4d8, 0x2bb45a92, 0x5cb36a04, -0x3d280059, -0x4a2f30cf, - 0x2cd99e8b, 0x5bdeae1d, -0x649b3d50, -0x139c0dda, 0x756aa39c, - 0x026d930a, -0x63f6f957, -0x14f1c9c1, 0x72076785, 0x05005713, - -0x6a40b57e, -0x1d4785ec, 0x7bb12bae, 0x0cb61b38, -0x6d2d7165, - -0x1a2a41f3, 0x7cdcefb7, 0x0bdbdf21, -0x792c2d2c, -0x0e2b1dbe, - 0x68ddb3f8, 0x1fda836e, -0x7e41e933, -0x0946d9a5, 0x6fb077e1, - 0x18b74777, -0x77f7a51a, -0x00f09590, 0x66063bca, 0x11010b5c, - -0x709a6101, -0x079d5197, 0x616bffd3, 0x166ccf45, -0x5ff51d88, - -0x28f22d12, 0x4e048354, 0x3903b3c2, -0x5898d99f, -0x2f9fe909, - 0x4969474d, 0x3e6e77db, -0x512e95b6, -0x2629a524, 0x40df0b66, - 0x37d83bf0, -0x564351ad, -0x2144613b, 0x47b2cf7f, 0x30b5ffe9, - -0x42420de4, -0x35453d76, 0x53b39330, 0x24b4a3a6, -0x452fc9fb, - -0x3228f96d, 0x54de5729, 0x23d967bf, -0x4c9985d2, -0x3b9eb548, - 0x5d681b02, 0x2a6f2b94, -0x4bf441c9, -0x3cf3715f, 0x5a05df1b, - 0x2d02ef8d); - } - - $crc = ~$crc; - for ($i = 0; $i < strlen($str); $i++) { - $crc = ($zip_crc_table[($crc ^ ord($str[$i])) & 0xff] - ^ (($crc >> 8) & 0xffffff)); - } - return ~$crc; -} - -define('GZIP_MAGIC', "\037\213"); -define('GZIP_DEFLATE', 010); - -function zip_deflate($content) -{ - // Compress content, and suck information from gzip header. - $z = gzencode($content); - - // Suck OS type byte from gzip header. FIXME: this smells bad. - - extract(unpack("a2magic/Ccomp_type/Cflags/@9/Cos_type", $z)); - - if ($magic != GZIP_MAGIC) - trigger_error(sprintf("Bad %s", "gzip magic"), E_USER_ERROR); - if ($comp_type != GZIP_DEFLATE) - trigger_error(sprintf("Bad %s", "gzip comp type"), E_USER_ERROR); - if (($flags & 0x3e) != 0) - trigger_error(sprintf("Bad %s", sprintf("flags (0x%02x)", $flags)), - E_USER_ERROR); - - $gz_header_len = 10; - $gz_data_len = strlen($z) - $gz_header_len - 8; - if ($gz_data_len < 0) - trigger_error("not enough gzip output?", E_USER_ERROR); - - extract(unpack("Vcrc32", substr($z, $gz_header_len + $gz_data_len))); - - return array(substr($z, $gz_header_len, $gz_data_len), // gzipped data - $crc32, // crc - $os_type // OS type - ); -} - -function zip_inflate($data, $crc32, $uncomp_size) -{ - $data = gzinflate($data); - if (strlen($data) != $uncomp_size) - trigger_error("not enough output from gzinflate", E_USER_ERROR); - $zcrc32 = zip_crc32($data); - if ($zcrc32 < 0) { // force unsigned - $zcrc32 += 4294967296; - } - if ($crc32 < 0) { // force unsigned - $crc32 += 4294967296; - } - if ($zcrc32 != $crc32) - trigger_error("CRC32 mismatch: calculated=$zcrc32, expected=$crc32", E_USER_ERROR); - return $data; -} - -function unixtime2dostime($unix_time) -{ - if ($unix_time % 1) - $unix_time++; // Round up to even seconds. - - list ($year, $month, $mday, $hour, $min, $sec) - = explode(" ", date("Y n j G i s", $unix_time)); - - if ($year < 1980) - list ($year, $month, $mday, $hour, $min, $sec) = array(1980, 1, 1, 0, 0, 0); - - $dosdate = (($year - 1980) << 9) | ($month << 5) | $mday; - $dostime = ($hour << 11) | ($min << 5) | ($sec >> 1); - - return array($dosdate, $dostime); -} - -function dostime2unixtime($dosdate, $dostime) -{ - $mday = $dosdate & 0x1f; - $month = ($dosdate >> 5) & 0x0f; - $year = 1980 + (($dosdate >> 9) & 0x7f); - - $sec = ($dostime & 0x1f) * 2; - $min = ($dostime >> 5) & 0x3f; - $hour = ($dostime >> 11) & 0x1f; - - return mktime($hour, $min, $sec, $month, $mday, $year); -} - -/** - * Class for zipfile creation. - */ -define('ZIP_DEFLATE', GZIP_DEFLATE); -define('ZIP_STORE', 0); -define('ZIP_CENTHEAD_MAGIC', "PK\001\002"); -define('ZIP_LOCHEAD_MAGIC', "PK\003\004"); -define('ZIP_ENDDIR_MAGIC', "PK\005\006"); - -class ZipWriter -{ - function ZipWriter($comment = "", $zipname = "archive.zip") - { - $this->comment = $comment; - $this->nfiles = 0; - $this->dir = ""; // "Central directory block" - $this->offset = 0; // Current file position. - - $zipname = addslashes($zipname); - header("Content-Type: application/zip; name=\"$zipname\""); - header("Content-Disposition: attachment; filename=\"$zipname\""); - } - - function addSrcFile($target, $src, $attrib = array()) - { - if (empty($attrib['mtime'])) - $attrib = array('mtime' => filemtime($src), 'is_ascii' => 0); - $this->addRegularFile($target, file_get_contents($src), $attrib); - } - - function addRegularFile($filename, $content, $attrib = array()) - { - $size = strlen($content); - list ($data, $crc32, $os_type) = zip_deflate($content); - if (strlen($data) < $size) { - $content = $data; // Use compressed data. - $comp_type = ZIP_DEFLATE; - } else - unset($crc32); // force plain store. - - if (!isset($crc32)) { - $comp_type = ZIP_STORE; - $crc32 = zip_crc32($content); - } - - if (!empty($attrib['write_protected'])) - $atx = (0100444 << 16) | 1; // S_IFREG + read permissions to - // everybody. - else - $atx = (0100644 << 16); // Add owner write perms. - - $ati = $attrib['is_ascii'] ? 1 : 0; - - if (empty($attrib['mtime'])) - $attrib['mtime'] = time(); - list ($mod_date, $mod_time) = unixtime2dostime($attrib['mtime']); - - // Construct parts common to "Local file header" and "Central - // directory file header." - if (!isset($attrib['extra_field'])) - $attrib['extra_field'] = ''; - if (!isset($attrib['file_comment'])) - $attrib['file_comment'] = ''; - - $head = pack("vvvvvVVVvv", - 20, // Version needed to extract (FIXME: is this right?) - 0, // Gen purp bit flag - $comp_type, - $mod_time, - $mod_date, - $crc32, - strlen($content), - $size, - strlen($filename), - strlen($attrib['extra_field'])); - - // Construct the "Local file header" - $lheader = ZIP_LOCHEAD_MAGIC . $head . $filename - . $attrib['extra_field']; - - // Construct the "central directory file header" - $this->dir .= pack("a4CC", - ZIP_CENTHEAD_MAGIC, - 23, // Version made by (FIXME: is this right?) - $os_type); - $this->dir .= $head; - $this->dir .= pack("vvvVV", - strlen($attrib['file_comment']), - 0, // Disk number start - $ati, // Internal file attributes - $atx, // External file attributes - $this->offset); // Relative offset of local header - $this->dir .= $filename . $attrib['extra_field'] - . $attrib['file_comment']; - - // Output the "Local file header" and file contents. - echo $lheader; - echo $content; - - $this->offset += strlen($lheader) + strlen($content); - $this->nfiles++; - } - - function finish() - { - // Output the central directory - echo $this->dir; - - // Construct the "End of central directory record" - echo ZIP_ENDDIR_MAGIC; - echo pack("vvvvVVv", - 0, // Number of this disk. - 0, // Number of disk with start of c dir - $this->nfiles, // Number entries on this disk - $this->nfiles, // Number entries - strlen($this->dir), // Size of central directory - $this->offset, // Offset of central directory - strlen($this->comment)); - echo $this->comment; - } -} - -/** - * Class for reading zip files. Handles buffers also. - * - * BUGS: - * - * Many of the ExitWiki()'s should probably be warn()'s (eg. CRC mismatch). - * - * Only a subset of zip formats is recognized. (I think that - * unsupported formats will be recognized as such rather than silently - * munged.) - * - * We don't read the central directory. This means we don't see the - * file attributes (text? read-only?), or file comments. - * - * Right now we ignore the file mod date and time, since we don't need it. - */ -class ZipReader -{ - function ZipReader($zipfile) - { - if (!is_string($zipfile)) { // filepointer: File already open - $this->fp = $zipfile; - $zipfile = NULL; - } elseif (((ord($zipfile[0]) * 256 + ord($zipfile[1])) % 31 == 0) // buffer - and (substr($zipfile, 0, 2) == "\037\213") - or (substr($zipfile, 0, 2) == "x\332") - ) { // 120, 218 - $this->fp = NULL; - $this->buf = $zipfile; - $zipfile = NULL; - } - if ($zipfile) { - $this->zipfile = $zipfile; - if (!($this->fp = fopen($zipfile, "rb"))) { - trigger_error(sprintf(_("Can't open ZIP file “%s” for reading"), - $zipfile), E_USER_ERROR); - } - } - } - - function _read($nbytes) - { - if ($this->fp) { - $chunk = fread($this->fp, $nbytes); - if (strlen($chunk) != $nbytes) - trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR); - return $chunk; - } elseif ($this->buf) { - if (strlen($this->buf) < $nbytes) - trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR); - $chunk = substr($this->buf, 0, $nbytes); - $this->buf = substr($this->buf, $nbytes); - return $chunk; - } - } - - function done() - { - if ($this->fp) - fclose($this->fp); - else - $this->buf = ''; - return false; - } - - function readFile() - { - $head = $this->_read(30); // FIXME: This is bad for gzip compressed buffers - - extract(unpack("a4magic/vreq_version/vflags/vcomp_type" - . "/vmod_time/vmod_date" - . "/Vcrc32/Vcomp_size/Vuncomp_size" - . "/vfilename_len/vextrafld_len", - $head)); - - if ($magic != ZIP_LOCHEAD_MAGIC) { - // maybe gzip? - //$x = substr($magic,0,3); - if (substr($magic, 0, 3) == "\037\213\225") //and (substr($magic,3,1) & 0x3e) == 0) - { - if ($this->fp) { - fclose($this->fp); - $this->fp = fopen($this->zipfile, "rb"); - $content = $this->_read(filesize($this->fp)); - } else { - $content = $this->buf; - } - // TODO... - $data = zip_deflate($content); - return array($filename, $data, $attrib); - } - if ($magic != ZIP_CENTHEAD_MAGIC) - // FIXME: better message? - ExitWiki(sprintf("Unsupported ZIP header type: %s", $magic)); - return $this->done(); - } - if (($flags & 0x21) != 0) - ExitWiki("Encryption and/or zip patches not supported."); - if (($flags & 0x08) != 0) - // FIXME: better message? - ExitWiki("Postponed CRC not yet supported."); - - $filename = $this->_read($filename_len); - //FIXME: we should probably check $req_version. - $attrib['mtime'] = dostime2unixtime($mod_date, $mod_time); - if ($extrafld_len != 0) - $attrib['extra_field'] = $this->_read($extrafld_len); - - $data = $this->_read($comp_size); - - if ($comp_type == ZIP_DEFLATE) { - $data = zip_inflate($data, $crc32, $uncomp_size); - } elseif ($comp_type == ZIP_STORE) { - $crc = zip_crc32($data); - if ($crc32 != $crc) - ExitWiki(sprintf("CRC mismatch %x != %x", $crc, $crc32)); - } else - ExitWiki(sprintf("Compression method %s unsupported", - $comp_method)); - - if (strlen($data) != $uncomp_size) - ExitWiki(sprintf("Uncompressed size mismatch %d != %d", - strlen($data), $uncomp_size)); - - return array($filename, $data, $attrib); - } -} - -/** - * Routines for Mime mailification of pages. - */ -//FIXME: these should go elsewhere (libmime?). - -/** - * Routines for quoted-printable en/decoding. - */ -function QuotedPrintableEncode($string) -{ - // Quote special characters in line. - $quoted = ""; - while ($string) { - // The complicated regexp is to force quoting of trailing spaces. - preg_match('/^([ !-<>-~]*)(?:([!-<>-~]$)|(.))/s', $string, $match); - $quoted .= $match[1] . $match[2]; - if (!empty($match[3])) - $quoted .= sprintf("=%02X", ord($match[3])); - $string = substr($string, strlen($match[0])); - } - // Split line. - // This splits the line (preferably after white-space) into lines - // which are no longer than 76 chars (after adding trailing '=' for - // soft line break, but before adding \r\n.) - return preg_replace('/(?=.{77})(.{10,74}[ \t]|.{71,73}[^=][^=])/s', - "\\1=\r\n", $quoted); -} - -function QuotedPrintableDecode($string) -{ - // Eliminate soft line-breaks. - $string = preg_replace('/=[ \t\r]*\n/', '', $string); - return quoted_printable_decode($string); -} - -define('MIME_TOKEN_REGEXP', "[-!#-'*+.0-9A-Z^-~]+"); - -function MimeContentTypeHeader($type, $subtype, $params) -{ - $header = "Content-Type: $type/$subtype"; - reset($params); - while (list($key, $val) = each($params)) { - //FIXME: what about non-ascii printables in $val? - if (!preg_match('/^' . MIME_TOKEN_REGEXP . '$/', $val)) - $val = '"' . addslashes($val) . '"'; - $header .= ";\r\n $key=$val"; - } - return "$header\r\n"; -} - -function MimeMultipart($parts) -{ - global $mime_multipart_count; - - // The string "=_" can not occur in quoted-printable encoded data. - $boundary = "=_multipart_boundary_" . ++$mime_multipart_count; - - $head = MimeContentTypeHeader('multipart', 'mixed', - array('boundary' => $boundary)); - - $sep = "\r\n--$boundary\r\n"; - - return $head . $sep . implode($sep, $parts) . "\r\n--${boundary}--\r\n"; -} - -/** - * For reference see: - * http://www.nacs.uci.edu/indiv/ehood/MIME/2045/rfc2045.html - * http://www.faqs.org/rfcs/rfc2045.html - * (RFC 1521 has been superceeded by RFC 2045 & others). - * - * Also see http://www.faqs.org/rfcs/rfc2822.html - * - * - * Notes on content-transfer-encoding. - * - * "7bit" means short lines of US-ASCII. - * "8bit" means short lines of octets with (possibly) the high-order bit set. - * "binary" means lines are not necessarily short enough for SMTP - * transport, and non-ASCII characters may be present. - * - * Only "7bit", "quoted-printable", and "base64" are universally safe - * for transport via e-mail. (Though many MTAs can/will be configured to - * automatically convert encodings to a safe type if they receive - * mail encoded in '8bit' and/or 'binary' encodings. - */ - -/** - * @param WikiDB_Page $page - * @param WikiDB_PageRevision $revision - * @return string - */ - -function MimeifyPageRevision(&$page, &$revision) -{ - // $wikidb =& $revision->_wikidb; - // $page = $wikidb->getPage($revision->getName()); - // FIXME: add 'hits' to $params - $params = array('pagename' => $page->getName(), - 'flags' => "", - 'author' => $revision->get('author'), - 'owner' => $page->getOwner(), - 'version' => $revision->getVersion(), - 'lastmodified' => $revision->get('mtime')); - - if ($page->get('mtime')) - $params['created'] = $page->get('mtime'); - if ($page->get('locked')) - $params['flags'] = 'PAGE_LOCKED'; - if (ENABLE_EXTERNAL_PAGES && $page->get('external')) - $params['flags'] = ($params['flags'] ? $params['flags'] . ',EXTERNAL_PAGE' : 'EXTERNAL_PAGE'); - if ($revision->get('author_id')) - $params['author_id'] = $revision->get('author_id'); - if ($revision->get('summary')) - $params['summary'] = $revision->get('summary'); - if ($page->get('hits')) - $params['hits'] = $page->get('hits'); - if ($page->get('owner')) - $params['owner'] = $page->get('owner'); - if ($page->get('perm') and class_exists('PagePermission')) { - $acl = getPagePermissions($page); - $params['acl'] = $acl->asAclLines(); - //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,... - } - - // Non-US-ASCII is not allowed in Mime headers (at least not without - // special handling) --- so we urlencode all parameter values. - foreach ($params as $key => $val) - $params[$key] = rawurlencode($val); - if (isset($params['acl'])) - // default: "view:_EVERY; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; ". - // "list:_EVERY; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY; " - $params['acl'] = str_replace(array("%3A", "%3B%20", "%2C"), array(":", "; ", ","), $params['acl']); - - $out = MimeContentTypeHeader('application', 'x-phpwiki', $params); - $out .= sprintf("Content-Transfer-Encoding: %s\r\n", - STRICT_MAILABLE_PAGEDUMPS ? 'quoted-printable' : 'binary'); - - $out .= "\r\n"; - - foreach ($revision->getContent() as $line) { - // This is a dirty hack to allow saving binary text files. See above. - $line = rtrim($line); - if (STRICT_MAILABLE_PAGEDUMPS) - $line = QuotedPrintableEncode(rtrim($line)); - $out .= "$line\r\n"; - } - return $out; -} - -/** - * Routines for parsing Mime-ified phpwiki pages. - */ -function ParseRFC822Headers(&$string) -{ - if (preg_match("/^From (.*)\r?\n/", $string, $match)) { - $headers['from '] = preg_replace('/^\s+|\s+$/', '', $match[1]); - $string = substr($string, strlen($match[0])); - } - - while (preg_match('/^([!-9;-~]+) [ \t]* : [ \t]* ' - . '( .* \r?\n (?: [ \t] .* \r?\n)* )/x', - $string, $match)) { - $headers[strtolower($match[1])] - = preg_replace('/^\s+|\s+$/', '', $match[2]); - $string = substr($string, strlen($match[0])); - } - - if (empty($headers)) - return false; - - if (strlen($string) > 0) { - if (!preg_match("/^\r?\n/", $string, $match)) { - // No blank line after headers. - return false; - } - $string = substr($string, strlen($match[0])); - } - - return $headers; -} - -function ParseMimeContentType($string) -{ - // FIXME: Remove (RFC822 style comments). - - // Get type/subtype - if (!preg_match(':^\s*(' . MIME_TOKEN_REGEXP . ')\s*' - . '/' - . '\s*(' . MIME_TOKEN_REGEXP . ')\s*:x', - $string, $match) - ) - ExitWiki(sprintf("Bad %s", 'MIME content-type')); - - $type = strtolower($match[1]); - $subtype = strtolower($match[2]); - $string = substr($string, strlen($match[0])); - - $param = array(); - while (preg_match('/^;\s*(' . MIME_TOKEN_REGEXP . ')\s*=\s*' - . '(?:(' . MIME_TOKEN_REGEXP . ')|"((?:[^"\\\\]|\\.)*)") \s*/sx', - $string, $match)) { - //" <--kludge for brain-dead syntax coloring - if (strlen($match[2])) - $val = $match[2]; - else - $val = preg_replace('/[\\\\](.)/s', '\\1', $match[3]); - - $param[strtolower($match[1])] = $val; - - $string = substr($string, strlen($match[0])); - } - - return array($type, $subtype, $param); -} - -function ParseMimeMultipart($data, $boundary) -{ - if (!$boundary) - ExitWiki("No boundary?"); - - $boundary = preg_quote($boundary); - - while (preg_match("/^(|.*?\n)--$boundary((?:--)?)[^\n]*\n/s", - $data, $match)) { - $data = substr($data, strlen($match[0])); - if (!isset($parts)) - $parts = array(); // First time through: discard leading chaff - else { - if ($content = ParseMimeifiedPages($match[1])) - for (reset($content); $p = current($content); next($content)) - $parts[] = $p; - } - - if ($match[2]) - return $parts; // End boundary found. - } - ExitWiki("No end boundary?"); -} - -function GenerateFootnotesFromRefs($params) -{ - $footnotes = array(); - reset($params); - while (list($p, $reference) = each($params)) { - if (preg_match('/^ref([1-9][0-9]*)$/', $p, $m)) - $footnotes[$m[1]] = sprintf(_("[%d] See [%s]"), - $m[1], rawurldecode($reference)); - } - - if (sizeof($footnotes) > 0) { - ksort($footnotes); - return "-----\n" - . "!" . _("References") . "\n" - . join("\n%%%\n", $footnotes) . "\n"; - } else - return ""; -} - -// counterpart to $acl->asAclLines() and rawurl undecode -// default: "view:_EVERY; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; ". -// "list:_EVERY; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY; " -function ParseMimeifiedPerm($string) -{ - if (!class_exists('PagePermission')) { - return ''; - } - $hash = array(); - foreach (explode(";", trim($string)) as $accessgroup) { - list($access, $groupstring) = explode(":", trim($accessgroup)); - $access = trim($access); - $groups = explode(",", trim($groupstring)); - foreach ($groups as $group) { - $group = trim($group); - $bool = (boolean)(substr($group, 0, 1) != '-'); - if (substr($group, 0, 1) == '-' or substr($group, 0, 1) == '+') - $group = substr($group, 1); - $hash[$access][$group] = $bool; - } - } - $perm = new PagePermission($hash); - $perm->sanify(); - return serialize($perm->perm); -} - -// Convert references in meta-data to footnotes. -// Only zip archives generated by phpwiki 1.2.x or earlier should have -// references. -function ParseMimeifiedPages($data) -{ - // We may need a lot of memory and time for the dump - ini_set("memory_limit", -1); - ini_set('max_execution_time', 0); - - if (!($headers = ParseRFC822Headers($data)) - || empty($headers['content-type']) - ) { - //trigger_error( sprintf(_("Can't find %s"),'content-type header'), - // E_USER_WARNING ); - return false; - } - $typeheader = $headers['content-type']; - - if (!(list ($type, $subtype, $params) = ParseMimeContentType($typeheader))) { - trigger_error(sprintf("Can't parse %s: (%s)", - 'content-type', $typeheader), - E_USER_WARNING); - return false; - } - if ("$type/$subtype" == 'multipart/mixed') { - return ParseMimeMultipart($data, $params['boundary']); - } elseif ("$type/$subtype" != 'application/x-phpwiki') { - trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"), - E_USER_WARNING); - return false; - } - - // FIXME: more sanity checking? - $page = array(); - $pagedata = array(); - $versiondata = array(); - if (isset($headers['date'])) - $pagedata['date'] = strtotime($headers['date']); - - //DONE: support owner and acl - foreach ($params as $key => $value) { - if (empty($value)) - continue; - $value = rawurldecode($value); - switch ($key) { - case 'pagename': - case 'version': - $page[$key] = $value; - break; - case 'flags': - if (preg_match('/PAGE_LOCKED/', $value)) - $pagedata['locked'] = 'yes'; - if (ENABLE_EXTERNAL_PAGES && preg_match('/EXTERNAL_PAGE/', $value)) - $pagedata['external'] = 'yes'; - break; - case 'owner': - case 'created': - case 'hits': - $pagedata[$key] = $value; - break; - case 'acl': - case 'perm': - if (class_exists('PagePermission')) { - $pagedata['perm'] = ParseMimeifiedPerm($value); - } - break; - case 'lastmodified': - $versiondata['mtime'] = $value; - break; - case 'author': - case 'author_id': - case 'summary': - case 'pagetype': - $versiondata[$key] = $value; - break; - } - } - - // FIXME: do we need to try harder to find a pagename if we - // haven't got one yet? - if (!isset($versiondata['author'])) { - global $request; - if (is_object($request)) { - $user = $request->getUser(); - $versiondata['author'] = $user->getId(); //FIXME:? - } - } - - $encoding = strtolower($headers['content-transfer-encoding']); - if ($encoding == 'quoted-printable') - $data = QuotedPrintableDecode($data); - else if ($encoding && $encoding != 'binary') - ExitWiki(sprintf("Unknown %s", 'encoding type: $encoding')); - - $data .= GenerateFootnotesFromRefs($params); - - $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data)); - $page['pagedata'] = $pagedata; - $page['versiondata'] = $versiondata; - - return array($page); -} - -// Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil -// End: Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/Makefile 2015-02-04 17:02:30 UTC (rev 9509) @@ -106,6 +106,7 @@ ${POT_FILE}: ../lib/loadsave.php ${POT_FILE}: ../lib/MailNotify.php ${POT_FILE}: ../lib/main.php +${POT_FILE}: ../lib/mimelib.php ${POT_FILE}: ../lib/PageList.php ${POT_FILE}: ../lib/PagePerm.php ${POT_FILE}: ../lib/PageType.php @@ -346,7 +347,6 @@ ${POT_FILE}: ../lib/XmlRpcClient.php ${POT_FILE}: ../lib/XmlRpcServer.php ${POT_FILE}: ../lib/XMLRPC/utils.php -${POT_FILE}: ../lib/ziplib.php ${POT_FILE}: ../themes/alphatest.php ${POT_FILE}: ../themes/blog/lib/RecentChanges.php ${POT_FILE}: ../themes/blog/templates/actionbar.tmpl Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/de.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -549,6 +549,13 @@ msgid "LatestSnapshot" msgstr "LetzeSicherung" +msgid "Cannot create ZIP archive" +msgstr "" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "Erzeugt von PhpWiki %s" + msgid "You must specify a directory to dump to" msgstr "Sie müssen zum Sichern ein Verzeichnis angeben." @@ -703,6 +710,10 @@ msgid "Loading InterWikiMap from external file %s." msgstr "Die InterWikiListe wird von der externen Datei %s geladen." +#, fuzzy +msgid "Cannot open ZIP archive for reading" +msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen" + msgid "Skipping" msgstr "Übersprungen" @@ -991,6 +1002,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "[%d] Siehe [%s]" + +msgid "References" +msgstr "Fußnoten" + +#, php-format msgid "Sort by %s" msgstr "Sortiere nach %s" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/es.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -538,6 +538,13 @@ msgid "LatestSnapshot" msgstr "La Foto Más última" +msgid "Cannot create ZIP archive" +msgstr "" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "Cree par PhpWiki %s" + msgid "You must specify a directory to dump to" msgstr "Usted debe especificar un directorio para descargar a" @@ -686,6 +693,9 @@ msgid "Loading InterWikiMap from external file %s." msgstr "Cargamento InterMapaDeWiki del archivo externo %s." +msgid "Cannot open ZIP archive for reading" +msgstr "" + msgid "Skipping" msgstr "El saltar" @@ -729,9 +739,9 @@ msgid "Page creation" msgstr "Versión de la página" -#, fuzzy, php-format +#, php-format msgid "Created by: %s" -msgstr "Cree: %s" +msgstr "Cree par: %s" #, php-format msgid "Summary: %s" @@ -972,6 +982,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "[%d] Vea [%s]" + +msgid "References" +msgstr "Referencias" + +#, php-format msgid "Sort by %s" msgstr "Clase por %s" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/fr.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -540,6 +540,13 @@ msgid "LatestSnapshot" msgstr "DernierInstantané" +msgid "Cannot create ZIP archive" +msgstr "Impossible de créer l'archive ZIP" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "Créé par PhpWiki %s" + msgid "You must specify a directory to dump to" msgstr "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde" @@ -687,6 +694,10 @@ msgid "Loading InterWikiMap from external file %s." msgstr "Chargement de la CarteInterWiki depuis le fichier %s." +#, fuzzy +msgid "Cannot open ZIP archive for reading" +msgstr "Impossible d'ouvrir le fichier ZIP « %s » en lecture" + msgid "Skipping" msgstr "Ignoré" @@ -972,6 +983,13 @@ "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3." #, php-format +msgid "[%d] See [%s]" +msgstr "[%d] Voir [%s]" + +msgid "References" +msgstr "Références" + +#, php-format msgid "Sort by %s" msgstr "Trier par %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/it.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -529,6 +529,13 @@ msgid "LatestSnapshot" msgstr "" +msgid "Cannot create ZIP archive" +msgstr "" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "" + msgid "You must specify a directory to dump to" msgstr "" @@ -675,6 +682,9 @@ msgid "Loading InterWikiMap from external file %s." msgstr "" +msgid "Cannot open ZIP archive for reading" +msgstr "" + msgid "Skipping" msgstr "" @@ -956,6 +966,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "" + +msgid "References" +msgstr "" + +#, php-format msgid "Sort by %s" msgstr "Ordina per %s" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/ja.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -516,6 +516,13 @@ msgid "LatestSnapshot" msgstr "" +msgid "Cannot create ZIP archive" +msgstr "" + +#, fuzzy, php-format +msgid "Created by PhpWiki %s" +msgstr "作成: %s" + msgid "You must specify a directory to dump to" msgstr "" @@ -664,6 +671,9 @@ msgid "Loading InterWikiMap from external file %s." msgstr "" +msgid "Cannot open ZIP archive for reading" +msgstr "" + msgid "Skipping" msgstr "" @@ -954,6 +964,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "" + +msgid "References" +msgstr "参照一覧" + +#, php-format msgid "Sort by %s" msgstr "%sでソートします。" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/nl.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -520,6 +520,13 @@ msgid "LatestSnapshot" msgstr "" +msgid "Cannot create ZIP archive" +msgstr "" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "" + msgid "You must specify a directory to dump to" msgstr "Je moet een directory specificeren om in te storten" @@ -666,6 +673,9 @@ msgid "Loading InterWikiMap from external file %s." msgstr "" +msgid "Cannot open ZIP archive for reading" +msgstr "" + msgid "Skipping" msgstr "Overgeslagen" @@ -947,6 +957,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "[%d] Zie [%s]" + +msgid "References" +msgstr "Referenties" + +#, php-format msgid "Sort by %s" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2015-02-04 15:33:42 UTC (rev 9508) +++ trunk/locale/po/sv.po 2015-02-04 17:02:30 UTC (rev 9509) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-28 17:35+0100\n" +"POT-Creation-Date: 2015-02-04 17:13+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -515,6 +515,13 @@ msgid "LatestSnapshot" msgstr "" +msgid "Cannot create ZIP archive" +msgstr "" + +#, php-format +msgid "Created by PhpWiki %s" +msgstr "" + msgid "You must specify a directory to dump to" msgstr "" @@ -661,6 +668,9 @@ msgid "Loading InterWikiMap from external file %s." msgstr "" +msgid "Cannot open ZIP archive for reading" +msgstr "" + msgid "Skipping" msgstr "" @@ -942,6 +952,13 @@ msgstr "" #, php-format +msgid "[%d] See [%s]" +msgstr "" + +msgid "References" +msgstr "" + +#, php-format msgid "Sort by %s" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2015-02-04 15:33:42 UTC (rev... [truncated message content] |
From: <var...@us...> - 2015-02-11 09:11:51
|
Revision: 9517 http://sourceforge.net/p/phpwiki/code/9517 Author: vargenau Date: 2015-02-11 09:11:42 +0000 (Wed, 11 Feb 2015) Log Message: ----------- Use && Modified Paths: -------------- trunk/lib/EditToolbar.php trunk/lib/IniConfig.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/Request.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/WatchPage.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php trunk/themes/fusionforge/themeinfo.php Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/EditToolbar.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -128,7 +128,7 @@ if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) { $username = $request->_user->UserName(); - if ((defined('FUSIONFORGE') and FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) { + if ((defined('FUSIONFORGE') && FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) { $username = '[[' . $username . ']]'; } $signature = " ––" . $username . " " . CTime(); @@ -320,7 +320,7 @@ $categories = array(); while ($p = $pages->next()) { $page = $p->getName(); - if ((defined('FUSIONFORGE') and FUSIONFORGE)) { + if ((defined('FUSIONFORGE') && FUSIONFORGE)) { $categories[] = "['$page', '%0A----%0A%5B%5B" . $page . "%5D%5D']"; } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) { $categories[] = "['$page', '%0A%5B" . $page . "%5D']"; Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/IniConfig.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -600,7 +600,7 @@ . 'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect'); // The FUSIONFORGE theme omits them - if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { + if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // Add some some action pages $ActionPages[] = 'DebugInfo'; $ActionPages[] = 'SpellCheck'; // SpellCheck does not work @@ -693,7 +693,7 @@ $AllAllowedPlugins[] = 'DebugRetransform'; // The FUSIONFORGE theme omits them - if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { + if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; $AllAllowedPlugins[] = 'CacheTest'; $AllAllowedPlugins[] = 'CategoryPage'; @@ -748,7 +748,7 @@ $AllActionPages[] = 'SetGlobalAccessRightsSimple'; $AllActionPages[] = 'UserContribs'; - if ((defined('FUSIONFORGE') and FUSIONFORGE)) { + if ((defined('FUSIONFORGE') && FUSIONFORGE)) { if (ENABLE_EXTERNAL_PAGES) { $AllAllowedPlugins[] = 'WikiAdminSetExternal'; $AllActionPages[] = 'PhpWikiAdministration/SetExternal'; @@ -861,7 +861,7 @@ define('DEFAULT_LANGUAGE', ''); // detect from client // FusionForge hack - if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { + if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // Disable update_locale because Zend Debugger crash if (!extension_loaded('Zend Debugger')) { update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE); Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/MailNotify.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -65,7 +65,7 @@ private function fromId() { global $request; - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { return $request->_user->getId(); } else { return $request->_user->getId() . '@' . $request->get('REMOTE_HOST'); @@ -83,7 +83,7 @@ global $request; // Disable verification of emails for corporate env. - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $doverify = false; } Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/PageList.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -1406,7 +1406,7 @@ trigger_error(sprintf("%s: Bad column", $column), E_USER_NOTICE); return false; } - if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { + if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // FIXME: anon users might rate and see ratings also. // Defer this logic to the plugin. if ($column == 'rating' and !$request->_user->isSignedIn()) { Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/PagePerm.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -241,7 +241,7 @@ $page = $request->getPage($pagename); // Exceptions: - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && !$page->get('external')) { $permcache[$pagename][$access] = 0; return 0; Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/Request.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -636,7 +636,7 @@ function get_old($key) { - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { return false; } $vars = &$GLOBALS['HTTP_COOKIE_VARS']; Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/WikiTheme.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -233,7 +233,7 @@ return; } $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikicommon.js")))); - if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { + if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // FusionForge already loads this $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-1.11.1.min.js")))); $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js")))); Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/WikiUser.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -567,7 +567,7 @@ { if (!$userid) $userid = $this->_userid; if (!$userid) return false; - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { return true; } return preg_match("/^[\-\w\.@ ]+$/U", $userid) and strlen($userid) < 32; @@ -1765,7 +1765,7 @@ function get($name) { // get e-mail address from FusionForge - if ((defined('FUSIONFORGE') and FUSIONFORGE) && session_loggedin()) { + if ((defined('FUSIONFORGE') && FUSIONFORGE) && session_loggedin()) { $user = session_get_user(); return $user->getEmail(); } else { @@ -1776,7 +1776,7 @@ function sanify($value) { // e-mail address is already checked by FusionForge - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { return $value; } // check for valid email address @@ -1808,7 +1808,7 @@ global $request; // e-mail address is already checked by FusionForge - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { return; } if (!empty($this->_init)) { @@ -2001,7 +2001,7 @@ // This should be probably be done with $customUserPreferenceColumns // For now, we use FUSIONFORGE define - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $fusionforgeprefs = array( 'pageTrail' => new _UserPreference_bool(), 'diffMenuItem' => new _UserPreference_bool(), @@ -2194,7 +2194,7 @@ } } - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { // Merge current notifyPages with notifyPagesAll // notifyPages are pages to notify in the current project // while $notifyPagesAll is used to store all the monitored pages. @@ -2244,7 +2244,7 @@ } } - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { // Restore notifyPages from notifyPagesAll // notifyPages are pages to notify in the current project // while $notifyPagesAll is used to store all the monitored pages. Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/loadsave.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -1521,7 +1521,7 @@ 'CategoryActionPage', 'PhpWikiAdministration'); - if ((defined('FUSIONFORGE') and FUSIONFORGE)) { + if ((defined('FUSIONFORGE') && FUSIONFORGE)) { $mandatory[] = 'Template/UserPage'; } else { $mandatory[] = 'Help/TextFormattingRules'; Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/main.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -976,7 +976,7 @@ // Switched auth between sessions. // Note: There's no way to demandload a missing class-definition // afterwards! Stupid php. - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { if (empty($_SERVER['PHP_AUTH_USER'])) { return false; } @@ -1463,7 +1463,7 @@ $request->finish(); } -if ((!(defined('FUSIONFORGE') and FUSIONFORGE)) || (forge_get_config('installation_environment') != 'production')) { +if ((!(defined('FUSIONFORGE') && FUSIONFORGE)) || (forge_get_config('installation_environment') != 'production')) { if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5? error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT else Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/plugin/PluginManager.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -126,7 +126,7 @@ // make a link if an actionpage exists $pluginNamelink = $pluginName; $pluginDocPageName = "Help" . "/" . $pluginName . "Plugin"; - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $pluginDocPageName = "Help" . ":" . $pluginName . "Plugin"; } @@ -154,7 +154,7 @@ $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'if_known'); } - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known'); } Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/plugin/UpLoad.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -109,7 +109,7 @@ // Make sure that the user is logged in. $user = $request->getUser(); if (!$user->isAuthenticated()) { - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $message->pushContent(HTML::div(array('class' => 'error'), HTML::p(_("You cannot upload files.")), HTML::ul( Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/plugin/UserPreferences.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -75,7 +75,7 @@ $user->_request = $request; if (is_a($request, 'MockRequest')) return ''; - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { if (!($user->isAuthenticated())) { return HTML::p(array('class' => 'error'), _("Error: You are not logged in, cannot display UserPreferences.")); Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/plugin/WatchPage.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -113,7 +113,7 @@ $page = $args['page']; if (!$user->isAuthenticated() or empty($userid)) { // wrong or unauthenticated user - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { // No login banner for FusionForge return HTML::div(array('class' => 'error'), HTML::p(_("You must sign in to watch pages."))); @@ -122,7 +122,7 @@ } else { $pref = &$request->_prefs; $messages = ""; - if (!defined('FUSIONFORGE') or !FUSIONFORGE) { + if (!defined('FUSIONFORGE') || !FUSIONFORGE) { $email = $pref->get("email"); if (empty($email)) { return HTML::p( Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/wikilens/RatingsDb.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -382,7 +382,7 @@ $where = "WHERE"; } if (isset($pagename)) { - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $rateeid = $this->_sqlbackend->_get_pageid($pagename, true); $where .= " rateepage=$rateeid"; } else { @@ -395,7 +395,7 @@ $where .= " dimension=$dimension"; } extract($dbi->_table_names); - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl " . $where; } else { $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage"; Modified: trunk/lib/wikilens/RatingsUser.php =================================================================== --- trunk/lib/wikilens/RatingsUser.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/lib/wikilens/RatingsUser.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -340,7 +340,7 @@ $rating_iter = $dbi->get_rating_page(null, $this->_userid); while ($rating = $rating_iter->next()) { - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $rating['pagename'] = preg_replace('/^' . PAGE_PREFIX . '/', '', $rating['pagename']); } $this->_num_ratings++; Modified: trunk/themes/fusionforge/themeinfo.php =================================================================== --- trunk/themes/fusionforge/themeinfo.php 2015-02-09 14:12:08 UTC (rev 9516) +++ trunk/themes/fusionforge/themeinfo.php 2015-02-11 09:11:42 UTC (rev 9517) @@ -31,7 +31,7 @@ $submenu = Template('navbar')->asXML(); - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { $domain = textdomain(NULL); textdomain('fusionforge'); @@ -80,8 +80,7 @@ function footer() { - - if (defined('FUSIONFORGE') and FUSIONFORGE) { + if (defined('FUSIONFORGE') && FUSIONFORGE) { global $HTML; $domain = textdomain(NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-11 14:54:54
|
Revision: 9522 http://sourceforge.net/p/phpwiki/code/9522 Author: vargenau Date: 2015-02-11 14:54:51 +0000 (Wed, 11 Feb 2015) Log Message: ----------- MAX_FILE_SITE --> MAX_FILE_SIZE Modified Paths: -------------- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/pgsrc/Help%2FUpLoadPlugin Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2015-02-11 13:32:57 UTC (rev 9521) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2015-02-11 14:54:51 UTC (rev 9522) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 +Date: Wed, 11 Feb 2015 15:54:13 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; @@ -38,7 +38,7 @@ # The user must be authenticated to be able to upload. # The filename may not end with certain disallowed extensions, to prevent from abuse. -# MAX_FILE_SITE is configured by the config.ini option MAX_UPLOAD_SIZE, which defaults to 16MB. +# MAX_FILE_SIZE is configured by the config.ini option MAX_UPLOAD_SIZE, which defaults to 16MB. Your webserver and php may add another limit. # Already existing uploaded files are NOT overwritten. # Certain internal php problems for Windows and MacOSX have been fixed with 1.3.9. Modified: trunk/pgsrc/Help%2FUpLoadPlugin =================================================================== --- trunk/pgsrc/Help%2FUpLoadPlugin 2015-02-11 13:32:57 UTC (rev 9521) +++ trunk/pgsrc/Help%2FUpLoadPlugin 2015-02-11 14:54:51 UTC (rev 9522) @@ -1,4 +1,4 @@ -Date: Mon, 3 Nov 2014 15:32:08 +0000 +Date: Wed, 11 Feb 2015 15:53:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Help%2FUpLoadPlugin; @@ -8,8 +8,8 @@ The **~UpLoad** [[Help:WikiPlugin|plugin]] displays an editbox and two buttons. * The first button lets you choose the file to be uploaded at your local filesystem. The text value of this button is localised from your browser. -* The second "Upload" button actually uploads the given filename to the upload directory. -This directory is not browsable, any file there may be accessed by using the "Upload~:" +* The second “Upload” button actually uploads the given filename to the upload directory. +This directory is not browsable, any file there may be accessed by using the “Upload~:” [[InterWikiMap]] prefix to the given filename. This way you can easily inline uploaded images. == Usage == @@ -47,7 +47,7 @@ # The user must be authenticated to be able to upload. # The filename may not end with certain disallowed extensions, to prevent from abuse. -# MAX_FILE_SITE is configured by the config.ini option MAX_UPLOAD_SIZE, which defaults to 16MB. Your webserver and PHP may add another limit. +# MAX_FILE_SIZE is configured by the ##config.ini## option MAX_UPLOAD_SIZE, which defaults to 16MB. Your webserver and PHP may add another limit. # Already existing uploaded files are NOT overwritten. == Example == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-11 17:19:09
|
Revision: 9526 http://sourceforge.net/p/phpwiki/code/9526 Author: vargenau Date: 2015-02-11 17:19:01 +0000 (Wed, 11 Feb 2015) Log Message: ----------- You must be logged in to add blog entries. Modified Paths: -------------- trunk/PhpWiki.wsdl trunk/lib/plugin/WikiBlog.php Modified: trunk/PhpWiki.wsdl =================================================================== --- trunk/PhpWiki.wsdl 2015-02-11 16:08:34 UTC (rev 9525) +++ trunk/PhpWiki.wsdl 2015-02-11 17:19:01 UTC (rev 9526) @@ -360,7 +360,7 @@ <service name="wikiService"> <port name="wikiPortType" binding="tns:wikiBinding"> - <soap:address location="http://phpwiki.fr/SOAP.php" /> + <soap:address location="http://phpwiki.nmu.alcatel.fr/phpwiki/SOAP.php" /> </port> </service> </definitions> Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2015-02-11 16:08:34 UTC (rev 9525) +++ trunk/lib/plugin/WikiBlog.php 2015-02-11 17:19:01 UTC (rev 9526) @@ -95,9 +95,6 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - // allow empty pagenames for ADMIN_USER style blogs: "Blog/day" - //if (!$args['pagename']) - // return $this->error(_("No pagename specified")); // Get our form args. $blog = $request->getArg("edit"); @@ -142,21 +139,20 @@ // This is similar to editpage. Shouldn't we use just this for preview? $parent = $posted['pagename']; if (empty($parent)) { - $prefix = ""; // allow empty parent for default "Blog/day" + $prefix = ''; // allow empty parent for default "Blog/day" $parent = HOME_PAGE; } elseif (($parent == 'Blog' or $parent == 'WikiBlog') and $type == 'wikiblog') { // avoid Blog/Blog/2003-01-11/14:03:02+00:00 - $prefix = ""; + $prefix = ''; $parent = ''; // 'Blog'; } elseif ($parent == 'Comment' and $type == "comment") { - $prefix = ""; + $prefix = ''; $parent = ''; // 'Comment'; } elseif ($parent == 'Forum' and $type == "wikiforum") { - $prefix = ""; + $prefix = ''; $parent = ''; // 'Forum'; } else { $prefix = $parent . '/'; } - //$request->finish(fmt("No pagename specified for %s",$type)); $now = time(); $dbi = $request->getDbh(); @@ -222,7 +218,9 @@ // Maybe add the BlogArchives plugin instead for the new interim subpage. $redirected = $prefix . $pagename; if (!$dbi->isWikiPage($redirected)) { - if (!$parent) $parent = HOME_PAGE; + if (!$parent) { + $parent = HOME_PAGE; + } require_once 'lib/loadsave.php'; $pageinfo = array('pagename' => $redirected, 'content' => '<<RedirectTo page="' . $parent . '">>', @@ -231,7 +229,7 @@ ); SavePage($request, $pageinfo, ''); } - $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time"); + $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", '', "$time"); if (!$dbi->isWikiPage($redirected)) { if (!$parent) $parent = HOME_PAGE; require_once 'lib/loadsave.php'; @@ -350,7 +348,7 @@ function findBlogs(&$dbi, $basepage = '', $type = 'wikiblog') { $prefix = (empty($basepage) - ? "" + ? '' : $basepage . '/') . $this->blogPrefix($type); $pages = $dbi->titleSearch(new TextSearchQuery('"' . $prefix . '"', true, 'none')); @@ -374,6 +372,13 @@ function showForm(&$request, $args, $template = 'blogform') { + $user = $request->getUser(); + if (!($user->isSignedIn())) { + // Cannot create entry + return HTML::p(array('class' => 'warning'), + _('You must be logged in to add blog entries.')); + } + // Show blog-entry form. $args = array('PAGENAME' => $args['pagename'], 'HIDDEN_INPUTS' => This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-12 10:05:53
|
Revision: 9532 http://sourceforge.net/p/phpwiki/code/9532 Author: vargenau Date: 2015-02-12 10:05:45 +0000 (Thu, 12 Feb 2015) Log Message: ----------- Spelling: seperator --> separator Modified Paths: -------------- trunk/doc/HISTORY trunk/lib/FileFinder.php trunk/lib/PageList.php trunk/lib/SemanticWeb.php trunk/lib/TextSearchQuery.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/Template.php trunk/lib/stdlib.php trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/pgsrc/ReleaseNotes Modified: trunk/doc/HISTORY =================================================================== --- trunk/doc/HISTORY 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/doc/HISTORY 2015-02-12 10:05:45 UTC (rev 9532) @@ -64,7 +64,7 @@ adds PHPWIKI_DIR if started from another dir, lib/pear also ** fix slashify for Windows * check more config-default and predefined constants -* AutoSplit pagenames at subpage seperators, esp for Sidebar theme +* AutoSplit pagenames at subpage separators, esp for Sidebar theme * improve Pagelist layout by equal pagename width for limited lists * added CPAN to interwiki.map * ExternalSearchPlugin useimage arg (RFE #952323) Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/FileFinder.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -58,7 +58,7 @@ } /** - * Force using '/' as path seperator. + * Force using '/' as path separator. * * @param string $path * @param string $sep @@ -226,15 +226,12 @@ /** * The system-dependent path-separator character. On UNIX systems, * this character is ':'; on Win32 systems it is ';'. - * Fixme: - * On Mac it cannot be : because this is the seperator there! * * @return string path_separator. */ public function _get_ini_separator() { return isWindows() ? ';' : ':'; - // return preg_match('/^Windows/', php_uname()) } /** Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/PageList.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -1839,15 +1839,15 @@ private function generateCommaListAsString() { if (defined($this->_options['commasep'])) - $seperator = $this->_options['commasep']; + $separator = $this->_options['commasep']; else - $seperator = ', '; + $separator = ', '; $pages = array(); foreach ($this->_pages as $pagenum => $page) { if ($s = $this->renderPageRow($page)) // some pages are not viewable $pages[] = is_string($s) ? $s : $s->asString(); } - return HTML(join($seperator, $pages)); + return HTML(join($separator, $pages)); } // comma=2 @@ -1858,15 +1858,15 @@ private function generateCommaList() { if (defined($this->_options['commasep'])) - $seperator = HTML::raw($this->_options['commasep']); + $separator = HTML::raw($this->_options['commasep']); else - $seperator = ', '; + $separator = ', '; $html = HTML(); $html->pushContent($this->renderPageRow($this->_pages[0])); next($this->_pages); foreach ($this->_pages as $pagenum => $page) { if ($s = $this->renderPageRow($page)) // some pages are not viewable - $html->pushContent($seperator, $s); + $html->pushContent($separator, $s); } return $html; } Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/SemanticWeb.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -304,7 +304,7 @@ } /** - * Strip non-numeric chars from the variable (as the groupseperator) and replace + * Strip non-numeric chars from the variable (as the group separator) and replace * it in the symbolic query for evaluation. * This version unifies the attribute values from the database to a * numeric basevalue before comparison. (area:=963.6km^2 => 9.366e+08 m^2) Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/TextSearchQuery.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -467,7 +467,7 @@ } /** - * Strip non-numeric chars from the variable (as the groupseperator) and replace + * Strip non-numeric chars from the variable (as the group separator) and replace * it in the symbolic query for evaluation. * * @param $value number A numerical value: integer, float or string. Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/plugin/SystemInfo.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -101,7 +101,7 @@ function getDefaultArguments() { - return array( // 'seperator' => ' ', // on multiple args + return array( // 'separator' => ' ', // on multiple args ); } @@ -518,7 +518,7 @@ // don't parse argstr for name=value pairs. instead we use just 'name' //$args = $this->getArgs($argstr, $request); $this->_dbi =& $dbi; - $args['seperator'] = ' '; + $args['separator'] = ' '; $availableargs = // name => callback + 0 args array('appname' => create_function('', "return 'PhpWiki';"), 'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"), @@ -573,11 +573,11 @@ if (is_object($o)) return $o; else - $output .= ($o . $args['seperator']); + $output .= ($o . $args['separator']); } - // if more than one arg, remove the trailing seperator + // if more than one arg, remove the trailing separator if ($output) $output = substr($output, 0, - -strlen($args['seperator'])); + -strlen($args['separator'])); return HTML($output); } } Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/plugin/Template.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -25,7 +25,7 @@ * Template: Parametrized blocks. * Include text from a wiki page and replace certain placeholders by parameters. * Similiar to CreatePage with the template argument, but at run-time. - * Similiar to the mediawiki templates but not with the "|" parameter seperator. + * Similiar to the mediawiki templates but not with the "|" parameter separator. * Usage: <<Template page=TemplateFilm vars="title=rurban&year=1999" >> * Author: Reini Urban * See also: http://meta.wikimedia.org/wiki/Help:Template Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/lib/stdlib.php 2015-02-12 10:05:45 UTC (rev 9532) @@ -698,7 +698,7 @@ function SplitQueryArgs($query_args = '') { - // FIXME: use the arg-seperator which might not be & + // FIXME: use the arg-separator which might not be & $split_args = explode('&', $query_args); $args = array(); while (list($key, $val) = each($split_args)) @@ -1038,7 +1038,7 @@ $RE[] = '/([[:alpha:]])(_)/'; // Split numerals from following letters. $RE[] = '/(\d)([[:alpha:]])/'; - // Split at subpage seperators. TBD in WikiTheme.php + // Split at subpage separators. TBD in WikiTheme.php $RE[] = "/([^${sep}]+)(${sep})/"; $RE[] = "/(${sep})([^${sep}]+)/"; @@ -1782,7 +1782,7 @@ } return $new; } else { - // fixme: use better whitespace/word seperators + // fixme: use better whitespace/word separators $words = explode(' ', $content); if (count($words) > $n) { return join(' ', array_slice($words, 0, $n)) Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2015-02-12 10:05:45 UTC (rev 9532) @@ -13,8 +13,8 @@ Include text from a wiki page and replace certain placeholders by parameters. Similiar to CreatePage with the template argument, but at run-time. -Similiar to the mediawiki templates but not with the "|" parameter seperator. -Note: The mediawiki syntax is also supported. +Similiar to the Mediawiki templates but not with the "|" parameter separator. +Note: The Mediawiki syntax is also supported. === Usage {{{ Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2015-02-12 09:56:50 UTC (rev 9531) +++ trunk/pgsrc/ReleaseNotes 2015-02-12 10:05:45 UTC (rev 9532) @@ -1,4 +1,4 @@ -Date: Mon, 9 Feb 2015 11:21:12 +0000 +Date: Thu, 12 Feb 2015 11:04:21 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -576,7 +576,7 @@ adds PHPWIKI_DIR to the front if started from another dir, lib/pear to the end. ** fix slashify for Windows * check more config-default and predefined constants -* ~AutoSplit pagenames at subpage seperators, esp for Sidebar theme +* ~AutoSplit pagenames at subpage separators, esp for Sidebar theme * improve Pagelist layout by equal pagename width for limited lists * added CPAN, ~OsFaq2, ~WikiLens to interwiki.map * ~ExternalSearchPlugin useimage arg (RFE #952323) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-12 13:55:03
|
Revision: 9536 http://sourceforge.net/p/phpwiki/code/9536 Author: vargenau Date: 2015-02-12 13:55:00 +0000 (Thu, 12 Feb 2015) Log Message: ----------- wiki: use __construct Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/themes/Sidebar/themeinfo.php trunk/themes/blog/themeinfo.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-12 12:10:32 UTC (rev 9535) +++ trunk/lib/WikiTheme.php 2015-02-12 13:55:00 UTC (rev 9536) @@ -195,7 +195,7 @@ * @param string $theme_name * @param bool $noinit */ - function WikiTheme($theme_name = 'default', $noinit = false) + function __construct($theme_name = 'default', $noinit = false) { /** * @var WikiRequest $request @@ -1783,7 +1783,7 @@ * @param string $class The CSS class for the button. * @param array $options Additional attributes for the <input> tag. */ - function Button($text, $url, $class = '', $options = array()) + function __construct($text, $url, $class = '', $options = array()) { /** * @var WikiRequest $request @@ -1820,14 +1820,14 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function ImageButton($text, $url, $class, $img_url, $img_attr = array()) + function __construct($text, $url, $class, $img_url, $img_attr = array()) { /** * @var WikiRequest $request */ global $request; - $this->__construct('a', array('href' => $url)); + parent::__construct('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); // Google honors this @@ -1856,7 +1856,7 @@ * @param $class string The CSS class for the button. * @param $options array Additional attributes for the <input> tag. */ - function SubmitButton($text, $name = '', $class = '', $options = array()) + function __construct($text, $name = '', $class = '', $options = array()) { $this->__construct('input', array('type' => 'submit', 'value' => $text)); if ($name) @@ -1883,9 +1883,9 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array()) + function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) { - $this->__construct('input', array('type' => 'image', + parent::__construct('input', array('type' => 'image', 'src' => $img_url, 'alt' => $text)); if ($name) @@ -1915,7 +1915,7 @@ */ class SidebarBox { - function SidebarBox($title, $body) + function __construct($title, $body) { require_once 'lib/WikiPlugin.php'; $this->title = $title; @@ -1938,7 +1938,7 @@ public $_plugin, $_args = false, $_basepage = false; - function PluginSidebarBox($name, $args = false, $basepage = false) + function __construct($name, $args = false, $basepage = false) { require_once 'lib/WikiPlugin.php'; @@ -1969,7 +1969,7 @@ // Various boxes which are no plugins class RelatedLinksBox extends SidebarBox { - function RelatedLinksBox($title = false, $body = '', $limit = 20) + function __construct($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request @@ -1984,11 +1984,11 @@ $counter = 0; foreach ($page_content->getWikiPageLinks() as $link) { $linkto = $link['linkto']; - if (!$request->_dbi->isWikiPage($linkto)) + if (!$request->_dbi->isWikiPage($linkto)) continue; $this->body->pushContent(HTML::li(WikiLink($linkto))); $counter++; - if ($limit and $counter > $limit) + if ($limit and $counter > $limit) continue; } } @@ -1996,7 +1996,7 @@ class RelatedExternalLinksBox extends SidebarBox { - function RelatedExternalLinksBox($title = false, $body = '', $limit = 20) + function __construct($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2015-02-12 12:10:32 UTC (rev 9535) +++ trunk/themes/Sidebar/themeinfo.php 2015-02-12 13:55:00 UTC (rev 9536) @@ -36,8 +36,7 @@ function __construct($theme_name = 'Sidebar') { - $this->WikiTheme($theme_name); - //$this->calendarInit(true); + parent::__construct($theme_name); } /* Display up/down button with persistent state */ Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2015-02-12 12:10:32 UTC (rev 9535) +++ trunk/themes/blog/themeinfo.php 2015-02-12 13:55:00 UTC (rev 9536) @@ -48,7 +48,7 @@ function __construct($theme_name = 'blog') { - $this->WikiTheme($theme_name); + parent::__construct($theme_name); $this->calendarInit(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-12 17:38:37
|
Revision: 9538 http://sourceforge.net/p/phpwiki/code/9538 Author: vargenau Date: 2015-02-12 17:38:26 +0000 (Thu, 12 Feb 2015) Log Message: ----------- Update pgsrc Modified Paths: -------------- trunk/configurator.php trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb trunk/locale/fr/pgsrc/AliasAccueil trunk/locale/fr/pgsrc/Bac%C3%80Sable trunk/locale/fr/pgsrc/CarteInterWiki trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s trunk/locale/fr/pgsrc/ChercherUnePage trunk/locale/fr/pgsrc/ClassezLa trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier trunk/locale/fr/pgsrc/Derni%C3%A8resModifs trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes trunk/locale/fr/pgsrc/GestionDesPlugins trunk/locale/fr/pgsrc/HistoriqueDeLaPage trunk/locale/fr/pgsrc/InfosAuthentification trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage trunk/locale/fr/pgsrc/InfosSurLaPage trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es trunk/locale/fr/pgsrc/ManuelPhpWiki trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs trunk/locale/fr/pgsrc/QuiEstEnLigne trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage trunk/locale/fr/pgsrc/R%C3%A9troLiens trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral trunk/locale/fr/pgsrc/RechercheInterWiki trunk/locale/fr/pgsrc/RechercheParTitre trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/pgsrc/DebugAuthInfo trunk/pgsrc/PhpWikiAdministration trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl trunk/pgsrc/RecentVisitors Added Paths: ----------- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki Removed Paths: ------------- trunk/locale/fr/pgsrc/ListeDePages Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/configurator.php 2015-02-12 17:38:26 UTC (rev 9538) @@ -1280,7 +1280,7 @@ Other languages available:<pre> English \"en\" (English - HomePage) German \"de\" (Deutsch - StartSeite) -French \"fr\" (Français - Accueil) +French \"fr\" (Français - PageAccueil) Dutch \"nl\" (Nederlands - ThuisPagina) Spanish \"es\" (Español - PáginaPrincipal) Swedish \"sv\" (Svenska - Framsida) Modified: trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes =================================================================== --- trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,18 +1,17 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=%C3%89ditionsR%C3%A9centes; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les -modifications **mineures** sont montrées, et pas uniquement les plus -récentes (voir DernièresModifs pour les modifications non-mineures les -plus récentes). +Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les modifications **mineures** sont montrées, et pas uniquement les plus récentes. --------- -<<RecentChanges days||=3 show_all||=1 show_minor=1 daylist=1,3,7,30,90,0>> +//Voir [[DernièresModifs]] pour les modifications non-mineures les plus récentes.// ---- +<<RecentChanges days||=7 show_all||=1 show_minor||=1 daylist=1,3,7,30,90,0>> + +---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,49 +1,57 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=AdministrationDePhpWiki; flags=PAGE_LOCKED; + acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY"; charset=UTF-8 Content-Transfer-Encoding: binary -_*Note :*_ _La plupart des actions sur cette page nécessitent des privilèges -d'administrateur. Elles ne fonctionneront pas à moins que vous ayez défini un -nom d'administrateur et un mot de passe dans le fichier de configuration de -PhpWiki_ +**//Note ://** //La plupart des actions sur cette page nécessitent des privilèges d'administrateur.// -<<CreateToc jshide||=1 with_toclink||=1>> +<<CreateToc jshide||=0 with_toclink||=1 position=right with_counter=1>> -== Explorateur de pages +== Explorateur de pages == D'abord choississez une ou plusieurs pages et ensuite définissez une action : -<?plugin-form WikiAdminSelect s="nom de la page" ?> +<?plugin-form WikiAdminSelect s="*" ?> ou appelez directement les actions ~WikiAdmin disponibles : -| [[/Supprimer]] | [[/Renommer]] | [[/Remplacer]] | [[/DéfinirAcl]] | [[/Chown]] | [[/Droits]] +| [[/Chown]] | [[/Purger]] | [[/Supprimer]] | [[/Renommer]] | [[/RechercherRemplacer]] | [[/DéfinirAcl]] | [[/DéfinirAclSimple]] | [[/SupprimerAcl]] -== Gestionnaire d'utilisateur +== Global Access Rights == -EmailVerification est habituellement non-strict laissant ainsi des trous possibles qui peuvent être administrés ci-dessous. +These action pages will allow you to set the default access rights for wiki pages. +Pages without individual access rights will use these default access rights. +* [[SetGlobalAccessRightsSimple]] +* [[SetGlobalAccessRights]] +== User Management == + +=== Reset a users password === + +<?plugin-form PasswordReset textinput=user method=post ?> + +== Vérification du courriel == + +La vérification de courriel est habituellement non stricte laissant ainsi des trous possibles qui peuvent être administrés ci-dessous. + Ce bouton affichera la liste de tous les utilisateurs qui ont une adresse reconnue et les boutons pour effectuer une vérification manuelle. - <<WikiAdminUtils - action=email-verification - label="Vérification de l'email" - >> +<<WikiAdminUtils action=email-verification label="Vérification du courriel">> -== Nettoyage +== Nettoyage == -Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer -dans un état virginal en chargeant sa version par défaut depuis pgsrc: +Le [[BacÀSable]] du wiki est très simple à nettoyer. Vous pouvez ici le restaurer +dans un état virginal en chargeant sa version par défaut depuis pgsrc. -[ Râtisser le BacÀSable | phpwiki:?action=loadfile&source=pgsrc/SandBox ] +**[[phpwiki:?action=loadfile&overwrite=1&source=pgsrc/SandBox|Râtisser le BacÀSable]]** -== Sauvegarde des pages +== Sauvegarde des pages == -=== Récupération des fichiers +=== Récupération des fichiers === Ces liens mènent à des fichiers compressés au format ZIP, générés à la volée et contenant toutes les pages de votre Wiki. Le fichier zip sera téléchargé sur votre ordinateur. @@ -51,101 +59,67 @@ Si le PhpWiki est configuré pour le permettre, n'importe qui peut télécharger un fichier zip. -Si votre php supporte la ''zlib'', les fichiers dans l'archive seront compressés, sinon ils seront simplement stockés. +=== Sauvegarde dans un répertoire === -=== Sauvegarde dans un répertoire - Ici vous pouvez enregistrer les pages de votre Wiki dans le répertoire de votre choix. <<WikiForm action=dumpserial>> La version la plus récente de chaque page sera écrite dans le répertoire, à raison d'une page par fichier. Votre serveur doit avoir le droit d'écrire dans le répertoire ! -== Restauration +== Restauration == Si vous avez sauvegardé un ensemble de pages de PhpWiki, vous pouvez les recharger ici. Notez que les pages dans votre base de données seront écrasées ; ainsi, si vous avez récupéré votre [PageAccueil], lorsque vous le rechargerez depuis ce formulaire, il écrasera celui qui est actuellement dans votre base de données. Si vous désirez être sélectif, effacez juste du répertoire (ou du fichier zip) les pages que vous ne voulez pas charger. -=== Déposer un fichier sur le serveur +=== Déposer un fichier sur le serveur === -Ici vous pouvez déposer des archives Zip ou des fichiers simples depuis votre machine cliente. +Ici vous pouvez déposer des archives ZIP ou des fichiers simples depuis votre machine cliente. <<WikiForm action=upload>> +<<WikiForm action=upload buttontext="Upload & Overwrite" overwrite=1>> -=== Télécharger un fichier +=== Télécharger un fichier === Ici vous pouvez télécharger des archives ZIP, des fichiers individuels ou des répertoires entiers. Le fichier ou le répertoire doit être local au serveur http. Vous pouvez aussi utiliser ce formulaire pour charger les données d'un URL http: ou ftp:. <<WikiForm action=loadfile>> +<<WikiForm action=loadfile buttontext="Load & Overwrite" overwrite=1>> -=== Mise à jour +=== Mise à jour === Fait quelques vérifications et mises à jours automatiquement après avoir installé un nouveau moteur phpwiki de mise à jour * Met à jour les nouvelles pages ou les pages révisées depuis pgsrc -* Met à jour la base de données (mysql _page.id auto_increment_, ADD _session.sess_ip_), +* Met à jour la base de données (mysql //page.id auto_increment//, ADD //session.sess_ip//), -;:[ Mise à jour | phpwiki:HomePage?action=upgrade ] +Vous pouvez force le remplacement ou non : +* **[[phpwiki:HomePage?action=upgrade|Mettre à jour]]** +* **[[phpwiki:HomePage?action=upgrade&overwrite=1|Mettre à jour et remplacer]]** -== Format des fichiers +== Format des fichiers == +=== Format actuel === + Actuellement, les pages sont stockées, une par fichier, sous forme de messages électronique (RFC:822) MIME (RFC:2045). Le content-type utilisé est ''application/x-phpwiki'', et les métadonnées de chaque page sont codées dans les paramètres du content-type. Si le fichier contient plusieurs versions d'une page, il aura comme type ''multipart/mixed'', et contiendra plusieurs sous-parties, chacune de type ''application/x-phpwiki''. Le corps du message contient le texte de la page. -=== Anciens formats +=== Anciens formats === -**Fichiers sérialisés** +==== Fichiers sérialisés ==== La commande de sauvegarde dans un répertoire récupérait les pages en tant que chaînes php ''serialized()''. Cela rendait les fichiers très difficiles à lire pour les humains, et presque impossibles à éditer. -**Fichiers simples** +==== Fichiers simples ==== Avant cela, le texte des pages était simplement enregistré dans un fichier -- ce qui signifie que toutes les métadonnées des pages étaient perdues. Notez que lorsqu'on charge des ''fichiers simples'', le nom de la page est déduit du nom du fichier. Les fonctions de téléchargement et de chargement reconnaîtront automatiquement chacun de ces trois types de fichiers, et les géreront convenablement. -== Sauvegarde des pages au format xhtml +== Sauvegarde des pages au format XHTML == - <<WikiForm action=dumphtml>> +<<WikiForm action=dumphtml>> Ceci génèrera un répertoire de pages statiques convenables pour une distribution sur disque où des serveurs web ne sont pas disponible. Les liens variés pour les fonctions d'édition et de navigation sont enlevés de ces pages. La collection de fichiers XHTML peut aussi être téléchargée comme une **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**. -== Le coeur de phpwiki - -Tout ceci surtout pour des débogages (au moins c'est ce que j'espère). - -En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait -pas vous faire de mal. - -=== Purger le cache - -Si votre wiki est ainsi configuré, le contenu transformé (presque HTML) de la plus récente version des pages est mis en cache. Ceci accélère la vitesse de chargement dans le navigateur car transformer le texte wiki prend du temps. - -Une pression sur ce bouton effacera tout le cache. Le contenu de chaque page sera transformer et remis en cache la prochaine fois que quelqu'un la verra. - - <<WikiAdminUtils - action=purge-cache - label="Purge du cache" - >> - -=== Suppression des pages vides et non référencées - - *Attention!* en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer. - Ceci supprimera toute possibilité de retrouver les page ainsi supprimées. - - <<WikiAdminUtils - action=purge-empty-pages - label="Purge all empty unreferenced pages" - >> - -=== Suppression des pages indésirables dans la base des données wiki - -Les pages dont le nom commence avec un séparateur de sous-page (habituellement un slash =/=) ne sont pas autorisées. Elles sont parfois crées par un plugin mal écrit... - -Ce bouton effacera toutes les pages dont le nom est illégal. - <<WikiAdminUtils - action=purge-bad-pagenames - label="Nettoyage de WikiDB" - >> - ---- -[[DocumentationDePhpWiki]] +[[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=AdministrationDePhpWiki%2FD%C3%A9finirAcl; @@ -6,6 +6,10 @@ charset=UTF-8 Content-Transfer-Encoding: binary +Pour des modifications simples d'ACL, voir **[[phpwiki:?action=setaclsimple|DéfinirAclSimple]]**. + +---- + <<WikiAdminSetAcl>> ---- Added: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple (rev 0) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple 2015-02-12 17:38:26 UTC (rev 9538) @@ -0,0 +1,23 @@ +Date: Thu, 12 Feb 2015 18:33:10 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=AdministrationDePhpWiki%2FD%C3%A9finirAclSimple; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;" +|- +| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**. +|- +| {{(on)}} **//Restrictive Access Rights//** means **//Only logged users can see the page//**. +|} + +For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**. + +---- + +<<WikiAdminSetAclSimple>> + +---- +[[CatégoriePageDAction]] Added: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger (rev 0) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger 2015-02-12 17:38:26 UTC (rev 9538) @@ -0,0 +1,12 @@ +Date: Thu, 12 Feb 2015 18:33:10 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=AdministrationDePhpWiki%2FPurger; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +<<WikiAdminPurge>> + +---- +[[CatégoriePageDAction]] Added: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl (rev 0) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl 2015-02-12 17:38:26 UTC (rev 9538) @@ -0,0 +1,12 @@ +Date: Thu, 12 Feb 2015 18:33:10 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=PhpWikiAdministration%2FSupprimerAcl; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +<<WikiAdminDeleteAcl>> + +---- +[[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/Aide =================================================================== --- trunk/locale/fr/pgsrc/Aide 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Aide 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Aide; - flags=""; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Copied: trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages (from rev 9536, trunk/locale/fr/pgsrc/ListeDePages) =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages (rev 0) +++ trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages 2015-02-12 17:38:26 UTC (rev 9538) @@ -0,0 +1,66 @@ +Date: Tue, 7 Oct 2014 19:05:46 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=Aide%2FPluginListeDePages; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; + charset=UTF-8 +Content-Transfer-Encoding: binary + +The **~ListPages** [[Help:WikiPlugin|plugin]] is the simplest plugin to explicitly list a set of pages with all available +[[Help:PageList|PageList]] options, mainly used for a wikilens theme to display ratings info +and recommendations. + +It can also be used with the [[PluginList]] method to list a set of pages generated by +another plugin, and/or to exclude a set of pages generated by another plugin. + +See the [[Help:PageList|PageList]] options. + +== Usage == + +{{{ +<<ListPages arguments>> +}}} + +== Arguments == + +All [[Help:PageList|PageList]] arguments, plus the following ones: + +{| class="bordered" +|- +! Argument +! Description +! Default value +|- +| **pages** +| Pages to list +| false +|- +| **dimension** +| +| 0 +|} + +=== Additional info arguments === + +|= top3recs | recommendations (wikilens theme only) +|= numbacklinks | number of backlinks (links to the given page) +|= numpagelinks | number of forward links (links at the given page) + +== Examples == + +{{{ +<<ListPages pages=HomePage,FindPage>> +}}} + +{{{ +<<ListPages info=hits + sortby=hits + pages=<!plugin-list BackLink page=[] !> + exclude=ListPagesPlugin,WikiPlugin +>> +}}} + +<noinclude> +---- +[[PhpWikiDocumentation]] [[CategoryWikiPlugin]] +</noinclude> Modified: trunk/locale/fr/pgsrc/Aide%2FPluginWiki =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Aide%2FPluginWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Aide%2FPluginWiki; @@ -25,13 +25,13 @@ ~Les plugins Wiki permettent à chacun d'ajouter un nouveau type de contenu dynamique (ou autre fonctionnalité) aux pages wiki avec PhpWiki. Par exemple, -dans ce wiki, les DernièresModifs, RétroLiens, PagesSemblables et la plupart +dans ce wiki, les [[DernièresModifs]], [[RétroLiens]], [[PagesSemblables]] et la plupart des autres pages indexées sont toutes implémentées en utilisant les plugins. À plus ou moins court terme, l'ancien style phpwiki [[URLMagiquesPhpWiki]] sera remplacé par des plugins également. -== Exemple +== Exemple == Habituellement, on appelle un plugin en écrivant quelque chose comme ceci : Modified: trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Aide%2FPluginWikiBlog; @@ -14,7 +14,7 @@ après chaque article (ou billet). PluginWikiBlog est un plugin simple qui permet les entrées dans le style blog sur -une page. Essayez quelques entrées puis jeter un coup d'oeil sur les DernièresModifs +une page. Essayez quelques entrées puis jeter un coup d'oeil sur les [[DernièresModifs]] pour vous faire une idée de la façon dont ça fonctionne. <<WikiBlog>> Modified: trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Aide%2FWikiWikiWeb; @@ -16,7 +16,7 @@ ''L'Univers tend vers le chaos. L'Univers tend vers Wiki.'' -Vous pouvez dire bonjour sur [[DerniersVisiteurs]], ou en lire plus sur [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] et comment [[Aide:AjouterDesPages|AjouterDesPages]]. Pour le moment ce Wiki n'a pas de thème de discussion, alors allez-y, jouez avec et amusez-vous !! +Vous pouvez dire bonjour sur [[VisiteursRécents]], ou en lire plus sur [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] et comment [[Aide:AjouterDesPages|AjouterDesPages]]. Pour le moment ce Wiki n'a pas de thème de discussion, alors allez-y, jouez avec et amusez-vous !! -- [[Aide:Steve Wainstead|Steve Wainstead]]. Modified: trunk/locale/fr/pgsrc/AliasAccueil =================================================================== --- trunk/locale/fr/pgsrc/AliasAccueil 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/AliasAccueil 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=AliasAccueil; @@ -8,4 +8,4 @@ <<RedirectTo page=PageAccueil>> -(C'est une démonstration du PluginRedirection.) +(C'est une démonstration du greffon RedirectTo.) Modified: trunk/locale/fr/pgsrc/Bac%C3%80Sable =================================================================== --- trunk/locale/fr/pgsrc/Bac%C3%80Sable 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Bac%C3%80Sable 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Bac%C3%80Sable; - flags=""; + flags=EXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/CarteInterWiki =================================================================== --- trunk/locale/fr/pgsrc/CarteInterWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/CarteInterWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,10 +1,12 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=CarteInterWiki; + pagetype=interwikimap; flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary - - +The **~InterWiki map** used on this wiki is listed below. The map is taken +from the text in the verbatim block below. (But this only works if +this page is locked.) Modified: trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie =================================================================== --- trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,11 +1,27 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Cat%C3%A9gorieCat%C3%A9gorie; - flags=""; + flags=EXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -Voici la liste des catégories : +This is the base Category. -<<TitleSearch s=Catégorie noheader=1 exclude=CatégorieCatégorie>> +The following pages are part of this category: +<<BackLinks sortby||=pagename noheader||=1 exclude="Category*" limit=1000 >> + +This category has the following subcategories: +<<BackLinks sortby||=pagename noheader||=1 exclude="-Category*" limit=1000 >> + +== Category == + +This is a Category. Adding a link to this page puts the page under this Category. +When [[Help:EditText|editing]] a page, use the {{/themes/default/images/ed_category.png|[C]}} +button of the edit toolbar to insert a category into your page. + +== Create a new Category == + +To create a new category, enter its name (starting with “Category”) and hit button. + +<?plugin-form CreatePage s=CategoryBla template=Template/Category ?> Modified: trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes =================================================================== --- trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Cat%C3%A9gorieGroupes; @@ -12,7 +12,5 @@ une liste de noms d'utilisateurs et ensuite, par souci de cohésion, un lien vers cette page tous les quatre items. -* [Administrateurs] - ---- [[CatégorieCatégorie]] Modified: trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction =================================================================== --- trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,7 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=CatégoriePageDAction; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki =================================================================== --- trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,7 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=CatégoriePluginWiki; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s =================================================================== --- trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ChangementsLi%C3%A9s; @@ -7,3 +7,6 @@ Content-Transfer-Encoding: binary <<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0>> + +---- +[[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/ChercherUnePage =================================================================== --- trunk/locale/fr/pgsrc/ChercherUnePage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ChercherUnePage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,34 +1,60 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ChercherUnePage; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Voici quelques bons points de départ pour la navigation. * [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] vous donne quelques informations rapides sur le marquage Wiki. -* Les DernièresModifs sont enregistrées automatiquement. +* Les [[DernièresModifs]] sont enregistrées automatiquement. * DétailsTechniques sur la navigation et l'édition sur ce serveur. Voici une recherche sur les titres. Essayez quelque chose comme ''wiki'' ou ''sandwich''. -<?plugin-form TitleSearch?> +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> Utilisez ce qui suit pour une recherche en texte intégral. Ceci prend quelques secondes. Les résultats montreront toutes les lignes de chaque page contenant une correspondance. -<?plugin-form FullTextSearch?> +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> Dans une recherche !PagesFloues les titres de toutes les pages sont examinés pour trouver ceux qui s'épellent ou sonnent de façon similaire (en anglais). -<?plugin-form FuzzyPages?> +<?plugin-form FuzzyPages ?> + ------ -==== Trucs -Séparez les mots par des espaces. -**Tous** les mots doivent correspondre (c'est le ET logique)%%% -Pour exclure un mot, faites-le précéder d'un '-'.%%% +== Trucs == + +* Séparez les mots par des espaces. Tous les mots doivent correspondre (c'est le ET logique)%%% +* Pour exclure un mot, faites-le précéder d'un '-'.%%% Exemple : 'wiki text -php' recherche toutes les pages contenant les mots 'wiki' **et** 'text', mais ne contenant **pas** le mot 'php'. + +* Separate words with a space. All words have to match as substrings. +* '##OR##', grouping with parenthesis, string-quoting and some glob-style wildcard characters are also supported. +* To exclude words from a title search or full text search, prepend a '##-##'. +* Use '##^xx##' or '##xx~*##' to match words starting with '##xx##'. +* Use '##~*xx##' or '##xx$##' to match words ending with '##xx##'. +* Use '##^word$##' to match exact words. +* Use //regex=auto// and '##re:##' like '##re:word.*xx##' or //regex=posix// to use Posix regular expressions. (not yet) +* Use //regex=auto// and '##//##' like '##/^word$/##' or //regex=pcre// to match using Perl-style regular expressions. +* Use //regex=sql// to match using SQL-style wildcards '##%##' and '##_##'. +* Use //regex=none// to match any wildcards verbatim. + +=== Example === +* '##wiki text -php##' looks for all pages containing the words '##wiki##' and '##text##', but not containing the word '##php##'. + +---- +[[DocumentationDePhpWiki]] Modified: trunk/locale/fr/pgsrc/ClassezLa =================================================================== --- trunk/locale/fr/pgsrc/ClassezLa 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ClassezLa 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,12 +1,14 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ClassezLa; - flags=""; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary <<RateIt show=ratings>> +<<AllPages info=rating sortby||=-rating>> + ---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage =================================================================== --- trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Cr%C3%A9erUnePage; - flags=""; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary Added: trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki =================================================================== --- trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki (rev 0) +++ trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -0,0 +1,53 @@ +Date: Thu, 12 Feb 2015 18:33:10 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=locale/fr/pgsrc/D%C3%A9bogageDePhpWiki; + flags=PAGE_LOCKED; + acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY"; + charset=UTF-8 +Content-Transfer-Encoding: binary + +**//Note ://** //La plupart des actions sur cette page nécessitent des privilèges d'administrateur.// + +<<CreateToc jshide||=0 with_toclink||=1 position=right with_counter=1>> + +== Le coeur de Phpwiki == + +Tout ceci surtout pour des débogages (au moins c'est ce que j'espère). + +En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait +pas vous faire de mal. + +=== Purger le cache === + +Si votre wiki est ainsi configuré, le contenu transformé (presque HTML) de la plus récente version des pages est mis en cache. Ceci accélère la vitesse de chargement dans le navigateur car transformer le texte wiki prend du temps. + +Une pression sur ce bouton effacera tout le cache. Le contenu de chaque page sera transformer et remis en cache la prochaine fois que quelqu'un la verra. + + <<WikiAdminUtils + action=purge-cache + label="Purge du cache" + >> + +=== Suppression des pages vides et non référencées === + + *Attention!* en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer. + Ceci supprimera toute possibilité de retrouver les page ainsi supprimées. + + <<WikiAdminUtils + action=purge-empty-pages + label="Purge all empty unreferenced pages" + >> + +=== Suppression des pages indésirables dans la base des données wiki === + +Les pages dont le nom commence avec un séparateur de sous-page (habituellement un slash =/=) ne sont pas autorisées. Elles sont parfois crées par un plugin mal écrit... + +Ce bouton effacera toutes les pages dont le nom est illégal. + <<WikiAdminUtils + action=purge-bad-pagenames + label="Nettoyage de WikiDB" + >> + +---- +[[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier =================================================================== --- trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=D%C3%A9poserUnFichier; - flags=""; + flags=EXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/Derni%C3%A8resModifs =================================================================== --- trunk/locale/fr/pgsrc/Derni%C3%A8resModifs 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Derni%C3%A8resModifs 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,16 +1,12 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Derni%C3%A8resModifs; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -Voici une liste des pages récemment modifiées dans ce wiki (voir ÉditionsRécentes -pour obtenir la liste des modifications mineures). +<<RecentChanges days||=7 daylist=1,3,7,30,90,0 show_deleted||=1>> --------- -<<RecentChanges days||=7 daylist=1,3,7,30,90,0>> - ---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes =================================================================== --- trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Derni%C3%A8resModifsCompl%C3%A8tes; @@ -6,12 +6,13 @@ charset=UTF-8 Content-Transfer-Encoding: binary -Voici une liste de **toutes** les pages modifiées récemment sur ce wiki, et non -pas seulement des plus récentes comme dans DernièresModifs (Voir ÉditionsRécentes +Voici une liste de **toutes** les pages modifiées récemment sur ce wiki, et +pas seulement des plus récentes comme dans [[DernièresModifs]]. (Voir [[ÉditionsRécentes]] pour toutes les modifications mineures récentes). -------- -<<RecentChanges days||=3 show_all=1 daylist=1,3,7,30,90,-1>> +<<RecentChanges days||=7 show_all||=1 daylist=1,3,7,30,90,0>> + ---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/GestionDesPlugins =================================================================== --- trunk/locale/fr/pgsrc/GestionDesPlugins 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/GestionDesPlugins 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=GestionDesPlugins; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/HistoriqueDeLaPage =================================================================== --- trunk/locale/fr/pgsrc/HistoriqueDeLaPage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/HistoriqueDeLaPage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,11 +1,15 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=HistoriqueDeLaPage; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary +This wiki stores **all** changes as new versions. Deleting a page just empties the content, all previous versions are not lost. + +Click on two checkbox to see the **diff**, the changes between those two versions. + <<PageHistory>> ---- Modified: trunk/locale/fr/pgsrc/InfosAuthentification =================================================================== --- trunk/locale/fr/pgsrc/InfosAuthentification 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/InfosAuthentification 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,9 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=InfosAuthentification; - flags=LOCKED; + flags=PAGE_LOCKED; + acl="view:_AUTHENTICATED; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; list:_AUTHENTICATED; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY"; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage =================================================================== --- trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,9 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=InfosDeD%C3%A9bogage; flags=PAGE_LOCKED; + acl="view:_AUTHENTICATED; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; list:_AUTHENTICATED; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY"; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/InfosSurLaPage =================================================================== --- trunk/locale/fr/pgsrc/InfosSurLaPage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/InfosSurLaPage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=InfosSurLaPage; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es =================================================================== --- trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=LesPlusVisit%C3%A9es; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Deleted: trunk/locale/fr/pgsrc/ListeDePages =================================================================== --- trunk/locale/fr/pgsrc/ListeDePages 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ListeDePages 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,15 +0,0 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) -Content-Type: application/x-phpwiki; - pagename=ListeDePages; - flags=""; - charset=UTF-8 -Content-Transfer-Encoding: binary - -Ein einfaches Beispiel für das PluginListeDePages. Hauptsächlich für ein wikilens Thema benutzt, -um Ratings Info anzuzeigen. - -<<ListPages pages=HomePage,FindPage,WikiWikiWeb>> - ----- -[[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/ManuelPhpWiki =================================================================== --- trunk/locale/fr/pgsrc/ManuelPhpWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ManuelPhpWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ManuelPhpWiki; @@ -23,7 +23,7 @@ <<IncludePage page="Aide/RèglesDeFormatageDesTextes">> <<IncludePages pages=<!plugin-list BackLinks page=CatégoriePluginWiki sortby=pagename exclude="Template/*" !> >> -{| width="100%" -|- align="center" +{| style="width:100%" +|- class="align-center" | **FIN DU DOCUMENT** |} Modified: trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki =================================================================== --- trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Thu, 20 Nov 2014 14:25:52 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ModifsR%C3%A9centesPhpWiki; - flags=""; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/PageAccueil =================================================================== --- trunk/locale/fr/pgsrc/PageAccueil 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/PageAccueil 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=PageAccueil; @@ -9,7 +9,7 @@ * Qu'est-ce qu'un [[Aide:WikiWikiWeb|WikiWikiWeb]] ? Description courte de cette application. * Apprenez [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] et comment [[Aide:AjouterDesPages|AjouterDesPages]]. * Le [[BacÀSable]] est là pour jouer et expérimenter. -* Signez la page des [[DerniersVisiteurs]]. +* Signez la page des [[VisiteursRécents]]. * Visitez [[DernièresModifs]] pour voir les additions et les modifications les plus récentes. * Découvrez quelles pages sont [[LesPlusVisitées]]. * Lisez les [[NotesDeVersion]]. Modified: trunk/locale/fr/pgsrc/PageAl%C3%A9atoire =================================================================== --- trunk/locale/fr/pgsrc/PageAl%C3%A9atoire 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/PageAl%C3%A9atoire 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,15 +1,12 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=PageAl%C3%A9atoire; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -La quantité de pages aléatoires est un nombre entre 1 et 20. +<<RandomPage numpages=1 redirect=1>> ---- -<<RandomPage pages||=10 info||=''>> - ----- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/PagesOrphelines =================================================================== --- trunk/locale/fr/pgsrc/PagesOrphelines 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/PagesOrphelines 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=PagesOrphelines; @@ -6,7 +6,7 @@ charset=UTF-8 Content-Transfer-Encoding: binary -Les PagesOrphelines sont les pages qui ne sont liées à aucune autre. +Les **~PagesOrphelines** sont les pages qui ne sont liées à aucune autre. ---- Modified: trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es =================================================================== --- trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=PagesRecherch%C3%A9es; - flags=""; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/PagesSemblables =================================================================== --- trunk/locale/fr/pgsrc/PagesSemblables 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/PagesSemblables 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=PagesSemblables; @@ -6,9 +6,11 @@ charset=UTF-8 Content-Transfer-Encoding: binary -Les PagesSemblables sont des pages qui partagent un mot initial ou -final avec cette page (voir aussi Wiki:LikePages et MeatBall:LikePages). +Les **~PagesSemblables** sont des pages qui partagent un mot initial ou +final avec cette page (voir aussi [[Wiki:LikePages]] et [[MeatBall:LikePages]]). + ---- + <<LikePages>> ---- Modified: trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs =================================================================== --- trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,16 +1,11 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=Pr%C3%A9f%C3%A9rencesUtilisateurs; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -Vous pouvez désormais définir quelques préférences utilisateur. -Les valeurs de ces préférences sont actuellement stockées dans un -cookie (vous devez donc avoir validé les cookies pour pouvoir -utiliser cette fonctionnalité). - <<UserPreferences>> ---- Modified: trunk/locale/fr/pgsrc/QuiEstEnLigne =================================================================== --- trunk/locale/fr/pgsrc/QuiEstEnLigne 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/QuiEstEnLigne 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=QuiEstEnLigne; - flags=""; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage =================================================================== --- trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=R%C3%A9cup%C3%A9rationDeLaPage; @@ -6,18 +6,21 @@ charset=UTF-8 Content-Transfer-Encoding: binary - Voir une page wiki dans le format MIME ou la télécharger comme copie -d'une page unique. _Un vidage complet de toutes les pages est possible -avec AdministrationDePhpWiki._ +d'une page unique. //Un cliché complet de toutes les pages est possible +avec AdministrationDePhpWiki.// <<PageDump>> ---- -Entrer le nom exact de la page à vider : +Entrer le nom exact de la page à récupérer : <?plugin-form PageDump?> RechercheParTitre : <?plugin-form TitleSearch?> +== See Also == +* [[phpwiki:?action=viewsource|ViewSource]] +* [[PluginManager]] + ---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/R%C3%A9troLiens =================================================================== --- trunk/locale/fr/pgsrc/R%C3%A9troLiens 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/R%C3%A9troLiens 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=R%C3%A9troLiens; @@ -6,12 +6,7 @@ charset=UTF-8 Content-Transfer-Encoding: binary -Le contenu de toutes les pages est parcouru pour trouver des liens vers la page courante. -La fonction RétroLiens répond aussi à la question : "Quelles pages contiennent le -titre de cette page ?" +<<BackLinks include_self||=1>> ---- -<<BackLinks exclude||='' include_self||=1 noheader||=0 page||='' info||=''>> - ----- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral =================================================================== --- trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=RechercheEnTexteInt%C3%A9gral; @@ -11,12 +11,31 @@ ---- Recherches supplémentaires : -<?plugin-form TitleSearch?> -<?plugin-form FullTextSearch?> -<?plugin-form FuzzyPages?> +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> + +<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact>> + ---- +Create or edit page: + +<?plugin-form CreatePage ?> + +---- + <<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1>> ---- Modified: trunk/locale/fr/pgsrc/RechercheInterWiki =================================================================== --- trunk/locale/fr/pgsrc/RechercheInterWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/RechercheInterWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=RechercheInterWiki; - flags=""; + flags=PAGE_LOCKED; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/RechercheParTitre =================================================================== --- trunk/locale/fr/pgsrc/RechercheParTitre 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/RechercheParTitre 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,18 +1,33 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=RechercheParTitre; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary <<TitleSearch>> + ---- -Recherches supplémentaires : -<?plugin-form TitleSearch auto_redirect=0?> -<?plugin-form FullTextSearch?> -<?plugin-form FuzzyPages?> +Additional Searches: +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> + +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact + pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> + +<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction + editbox[] name=s text="" + submit[] + checkbox[] name=case_exact>> + ---- <<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1>> Modified: trunk/locale/fr/pgsrc/SondagePhpWiki =================================================================== --- trunk/locale/fr/pgsrc/SondagePhpWiki 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/SondagePhpWiki 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=SondagePhpWiki; @@ -6,7 +6,8 @@ charset=UTF-8 Content-Transfer-Encoding: binary -<<NoCache>> +Please answer our poll about [[Help:PhpWiki|PhpWiki]]: + <<WikiPoll require_all=0 require_least=2 question[1]="Appréciez-vous PhpWiki ?" answer[1][1]="Oui" answer[1][2]="Sans opinion" answer[1][3]="Non" @@ -19,6 +20,9 @@ answer[4][4]="usemod" answer[4][5]="Twiki" answer[4][5]="guiki" answer[4][6]="autre" question[5]="Quelle version de PhpWiki utilisez-vous ?" - answer[5][1]="1.2.x" answer[5][2]="1.3. 1-2" answer[5][3]="1.3. 3-4" - answer[5][4]="1.3. 5-8" answer[5][5]="1.3. 9-10" + answer[5][1]="1.2.x" answer[5][2]="1.3.1-12" answer[5][3]="1.3.13" + answer[5][4]="1.3.14" answer[5][5]="1.4.0" >> + +---- +[[DocumentationDePhpWiki]] Modified: trunk/locale/fr/pgsrc/TousLesUtilisateurs =================================================================== --- trunk/locale/fr/pgsrc/TousLesUtilisateurs 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/TousLesUtilisateurs 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,8 +1,8 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=TousLesUtilisateurs; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/fr/pgsrc/ToutesLesPages =================================================================== --- trunk/locale/fr/pgsrc/ToutesLesPages 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/ToutesLesPages 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,15 +1,16 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ToutesLesPages; - flags=PAGE_LOCKED; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; charset=UTF-8 Content-Transfer-Encoding: binary -Voici la liste de toutes les pages de ce Wiki, incluant des -PagesOrphelines qui seraient autrement inaccessibles. +Voici la liste de toutes les pages de ce Wiki, incluant les +[[PagesOrphelines|pages orphelines]] qui seraient autrement inaccessibles. +[[AllUserPages|Show only user pages]]. -<<AllPages>> +<<AllPages info||=mtime,author,hits sortby||=pagename>> ---- [[CatégoriePageDAction]] Modified: trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents =================================================================== --- trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:46 +0000 +Date: Thu, 12 Feb 2015 18:33:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=VisiteursR%C3%A9cents; @@ -6,7 +6,12 @@ charset=UTF-8 Content-Transfer-Encoding: binary -Signez et datez votre nom ci-dessous ! +Ajoutez votre nom ici, et datez votre visite ! -Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, les -auteurs de PhpWiki. +Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, Carsten Klapp, +Reini Urban, Marc-Etienne Vargenau, les [[The PhpWiki programming team|auteurs de PhpWiki]]. + +Julien Pierre De La Brière et Pierrick Meignen, deux traducteurs pour la version française. + +---- +[[DocumentationDePhpWiki]] Modified: trunk/pgsrc/DebugAuthInfo =================================================================== --- trunk/pgsrc/DebugAuthInfo 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/pgsrc/DebugAuthInfo 2015-02-12 17:38:26 UTC (rev 9538) @@ -1,4 +1,4 @@ -Date: Tue, 7 Oct 2014 19:05:57 +0000 +Date: Thu, 12 Feb 2015 18:19:21 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; @@ -8,3 +8,6 @@ Content-Transfer-Encoding: binary <<DebugAuthInfo>> + +---- +[[CategorActionPage]] Modified: trunk/pgsrc/PhpWikiAdministration =================================================================== --- trunk/pgsrc/PhpWikiAdministration 2015-02-12 17:15:32 UTC (rev 9537) +++ trunk/pgsrc/PhpWikiAdministration 2015-02-12 17:38:26 UT... [truncated message content] |
From: <var...@us...> - 2015-02-18 14:03:02
|
Revision: 9545 http://sourceforge.net/p/phpwiki/code/9545 Author: vargenau Date: 2015-02-18 14:02:54 +0000 (Wed, 18 Feb 2015) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/PhpWiki.wsdl trunk/lib/plugin/WhoIsOnline.php Modified: trunk/PhpWiki.wsdl =================================================================== --- trunk/PhpWiki.wsdl 2015-02-18 14:01:06 UTC (rev 9544) +++ trunk/PhpWiki.wsdl 2015-02-18 14:02:54 UTC (rev 9545) @@ -360,7 +360,7 @@ <service name="wikiService"> <port name="wikiPortType" binding="tns:wikiBinding"> - <soap:address location="http://phpwiki.fr/SOAP.php" /> + <soap:address location="http://phpwiki.nmu.alcatel.fr/phpwiki/SOAP.php" /> </port> </service> </definitions> Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2015-02-18 14:01:06 UTC (rev 9544) +++ trunk/lib/plugin/WhoIsOnline.php 2015-02-18 14:02:54 UTC (rev 9545) @@ -73,9 +73,10 @@ return new Template('online', $request, array_merge($args, $stats, $other)); } - // box is used to display a fixed-width, narrow version with common header - // just the number of online users. /** + * box is used to display a fixed-width, narrow version with common header + * just the number of online users. + * * @param string $args * @param WikiRequest $request * @param string $basepage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-18 15:35:00
|
Revision: 9546 http://sourceforge.net/p/phpwiki/code/9546 Author: vargenau Date: 2015-02-18 15:34:57 +0000 (Wed, 18 Feb 2015) Log Message: ----------- Revert r9536 and r9540 Revision Links: -------------- http://sourceforge.net/p/phpwiki/code/9536 http://sourceforge.net/p/phpwiki/code/9540 Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/themes/Sidebar/themeinfo.php trunk/themes/blog/themeinfo.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-18 14:02:54 UTC (rev 9545) +++ trunk/lib/WikiTheme.php 2015-02-18 15:34:57 UTC (rev 9546) @@ -195,7 +195,7 @@ * @param string $theme_name * @param bool $noinit */ - function __construct($theme_name = 'default', $noinit = false) + function WikiTheme($theme_name = 'default', $noinit = false) { /** * @var WikiRequest $request @@ -1783,7 +1783,7 @@ * @param string $class The CSS class for the button. * @param array $options Additional attributes for the <input> tag. */ - function __construct($text, $url, $class = '', $options = array()) + function Button($text, $url, $class = '', $options = array()) { /** * @var WikiRequest $request @@ -1820,14 +1820,14 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $url, $class, $img_url, $img_attr = array()) + function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { /** * @var WikiRequest $request */ global $request; - parent::__construct('a', array('href' => $url)); + $this->__construct('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); // Google honors this @@ -1856,9 +1856,9 @@ * @param $class string The CSS class for the button. * @param $options array Additional attributes for the <input> tag. */ - function __construct($text, $name = '', $class = '', $options = array()) + function SubmitButton($text, $name = '', $class = '', $options = array()) { - parent::__construct('input', array('type' => 'submit', 'value' => $text)); + $this->__construct('input', array('type' => 'submit', 'value' => $text)); if ($name) $this->setAttr('name', $name); if ($class) @@ -1883,9 +1883,9 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) + function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array()) { - parent::__construct('input', array('type' => 'image', + $this->__construct('input', array('type' => 'image', 'src' => $img_url, 'alt' => $text)); if ($name) @@ -1915,7 +1915,7 @@ */ class SidebarBox { - function __construct($title, $body) + function SidebarBox($title, $body) { require_once 'lib/WikiPlugin.php'; $this->title = $title; @@ -1938,7 +1938,7 @@ public $_plugin, $_args = false, $_basepage = false; - function __construct($name, $args = false, $basepage = false) + function PluginSidebarBox($name, $args = false, $basepage = false) { require_once 'lib/WikiPlugin.php'; @@ -1969,7 +1969,7 @@ // Various boxes which are no plugins class RelatedLinksBox extends SidebarBox { - function __construct($title = false, $body = '', $limit = 20) + function RelatedLinksBox($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request @@ -1996,7 +1996,7 @@ class RelatedExternalLinksBox extends SidebarBox { - function __construct($title = false, $body = '', $limit = 20) + function RelatedExternalLinksBox($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2015-02-18 14:02:54 UTC (rev 9545) +++ trunk/themes/Sidebar/themeinfo.php 2015-02-18 15:34:57 UTC (rev 9546) @@ -36,7 +36,7 @@ function __construct($theme_name = 'Sidebar') { - parent::__construct($theme_name); + $this->WikiTheme($theme_name); } /* Display up/down button with persistent state */ Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2015-02-18 14:02:54 UTC (rev 9545) +++ trunk/themes/blog/themeinfo.php 2015-02-18 15:34:57 UTC (rev 9546) @@ -45,10 +45,9 @@ class WikiTheme_blog extends WikiTheme { - function __construct($theme_name = 'blog') { - parent::__construct($theme_name); + $this->WikiTheme($theme_name); $this->calendarInit(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-19 10:59:22
|
Revision: 9550 http://sourceforge.net/p/phpwiki/code/9550 Author: vargenau Date: 2015-02-19 10:59:14 +0000 (Thu, 19 Feb 2015) Log Message: ----------- Move function ActionButton from themes/MonoBook/themeinfo.php to lib/WikiTheme.php: used by blog theme Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/themes/MonoBook/themeinfo.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-19 10:56:50 UTC (rev 9549) +++ trunk/lib/WikiTheme.php 2015-02-19 10:59:14 UTC (rev 9550) @@ -185,6 +185,30 @@ return $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options); } +function ActionButton($action, $label = false, $page_or_rev = false, $options = false) +{ + global $WikiTheme; + global $request; + if (is_array($action)) { + $attr = $action; + $act = isset($attr['action']) ? $attr['action'] : 'browse'; + } else + $act = $action; + $class = is_safe_action($act) ? 'named-wiki' : 'wikiadmin'; + /* if selected action is current then prepend selected */ + $curract = $request->getArg("action"); + if ($curract == $act and $curract != 'browse') + $class = "selected $class"; + if (!empty($options['class'])) { + if ($curract == 'browse') + $class = "$class " . $options['class']; + else + $class = $options['class']; + } + return HTML::li(array('class' => $class), + $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options)); +} + class WikiTheme { public $HTML_DUMP_SUFFIX = ''; Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2015-02-19 10:56:50 UTC (rev 9549) +++ trunk/themes/MonoBook/themeinfo.php 2015-02-19 10:59:14 UTC (rev 9550) @@ -18,33 +18,8 @@ require_once 'lib/WikiTheme.php'; require_once 'themes/wikilens/themeinfo.php'; -function ActionButton($action, $label = false, $page_or_rev = false, $options = false) -{ - global $WikiTheme; - global $request; - if (is_array($action)) { - $attr = $action; - $act = isset($attr['action']) ? $attr['action'] : 'browse'; - } else - $act = $action; - $class = is_safe_action($act) ? 'named-wiki' : 'wikiadmin'; - /* if selected action is current then prepend selected */ - $curract = $request->getArg("action"); - if ($curract == $act and $curract != 'browse') - $class = "selected $class"; - if (!empty($options['class'])) { - if ($curract == 'browse') - $class = "$class " . $options['class']; - else - $class = $options['class']; - } - return HTML::li(array('class' => $class), - $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options)); -} - class WikiTheme_MonoBook extends WikiTheme_Wikilens { - /* this adds selected to the class */ function makeActionButton($action, $label = false, $page_or_rev = false, $options = false) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-19 11:49:10
|
Revision: 9552 http://sourceforge.net/p/phpwiki/code/9552 Author: vargenau Date: 2015-02-19 11:49:07 +0000 (Thu, 19 Feb 2015) Log Message: ----------- Return Failed/Done message for doSavePage Modified Paths: -------------- trunk/PhpWiki.wsdl trunk/SOAP.php Modified: trunk/PhpWiki.wsdl =================================================================== --- trunk/PhpWiki.wsdl 2015-02-19 11:47:57 UTC (rev 9551) +++ trunk/PhpWiki.wsdl 2015-02-19 11:49:07 UTC (rev 9552) @@ -41,7 +41,7 @@ <part name="credentials" type="xsd:string"/> </message> <message name="doSavePageResponse"> - <part name="successcode" type="xsd:int"/> + <part name="successcode" type="xsd:string"/> </message> <message name="getAllPagenames"> Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2015-02-19 11:47:57 UTC (rev 9551) +++ trunk/SOAP.php 2015-02-19 11:49:07 UTC (rev 9552) @@ -83,7 +83,12 @@ 'mtime' => time(), 'pagetype' => 'wikitext' ); - return $page->save($content, $version + 1, $meta); + $ret = $page->save($content, $version + 1, $meta); + if ($ret === false) { + return "Failed"; + } else { + return "Done"; + } } // require 'view' access This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |