From: <var...@us...> - 2016-07-08 11:34:58
|
Revision: 9866 http://sourceforge.net/p/phpwiki/code/9866 Author: vargenau Date: 2016-07-08 11:34:55 +0000 (Fri, 08 Jul 2016) Log Message: ----------- Remove Fusionforge-specific files (g wikiadmin.php wikilist.php) Modified Paths: -------------- trunk/pgsrc/ReleaseNotes Removed Paths: ------------- trunk/g trunk/wikiadmin.php trunk/wikilist.php Deleted: trunk/g =================================================================== --- trunk/g 2016-07-08 11:32:02 UTC (rev 9865) +++ trunk/g 2016-07-08 11:34:55 UTC (rev 9866) @@ -1,309 +0,0 @@ -<?php -/* - * Copyright (C) 2008-2012 Alcatel-Lucent - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * Standard Alcatel-Lucent disclaimer for contributing to open source - * - * "The Configuration File ("Contribution") has not been tested and/or - * validated for release as or in products, combinations with products or - * other commercial use. Any use of the Contribution is entirely made at - * the user's own responsibility and the user can not rely on any features, - * functionalities or performances Alcatel-Lucent has attributed to the - * Contribution. - * - * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY - * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE, - * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE - * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER - * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND - * ALONE BASIS." - */ - -if (defined('WIKI_SOAP')) { - ini_set('memory_limit', -1); -} else { - ini_set('memory_limit', "256M"); -} -ini_set('pcre.backtrack_limit', 100000000); - -// Disable compression, seems needed to get all the messages. -$no_gz_buffer=true; - -if (defined('WIKI_SOAP')) { - require_once 'include/env.inc.php'; -} else { - require_once '../../../common/include/env.inc.php'; -} -require_once $gfcommon.'include/pre.php'; -require_once $gfplugins.'wiki/common/wikiconfig.class.php'; - -html_use_jquery(); -if (forge_get_config('use_jquery_form_navigate')) { - use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js'); - define('ENABLE_EDIT_TOOLBAR', true); -} else { - // Disable Toolbar for tests - define('ENABLE_EDIT_TOOLBAR', false); -} -define('JS_SEARCHREPLACE', false); - -if (defined('WIKI_SOAP')) { - $help = group_get_object_by_name('help'); - if ($help) { - $group_id = $help->getID(); - } else { - // Test system don't have help project, use projecta instead. - $group_id = 6; - } -} - -if (isset($group_id) && $group_id) { - if (! isset($project) || ! $project) { - $project = group_get_object($group_id); - } -} elseif(isset($project) && is_object($project)) { - $group_id = $project->getID(); -} - -if (! isset($group_id) || ! isset($project)) { - exit_no_group(); -} else if (!($project->usesPlugin("wiki"))) { - // We should test whether the wiki plugin is disabled globally - // in the Forge or by the current project. - // exit_disabled('home'); - exit_project_disabled('home'); -} else { - - global $robots; - - $robots = "noindex,nofollow"; - - $group_name = $project->getUnixName(); - $group_public_name = $project->getPublicName(); - - $is_external = method_exists($project, 'getIsExternal') && $project->getIsExternal(); - - $wc = new WikiConfig($group_id); - - define('VIRTUAL_PATH', '/wiki/g/'.$group_name); - global $page_prefix; - $page_prefix = '_g'.$group_id.'_'; - - // We have to use a smaller value than Phpwiki due to page prefix - define('MAX_PAGENAME_LENGTH', 92); - - define('THEME', 'fusionforge'); - - // For FusionForge, we create some specific pages, located in the theme - // except for given project - if ($group_name == forge_get_config('wiki_help_project', 'wiki')) { - define('WIKI_PGSRC', 'pgsrc'); - } else { - define('WIKI_PGSRC', 'themes/fusionforge/pgsrc'); - } - - define('FUSIONFORGE', true); - - define('PATH_INFO_PREFIX', '/'.$group_name . '/'); - define('USE_PATH_INFO', true); - - define('WIKI_NAME', $group_name); - - define('ALLOWED_PROTOCOLS', "http|https|mailto|ftp|ftps|news|nntp|ssh|gopher"); - - define('DISABLE_MARKUP_WIKIWORD', $wc->getWikiConfig('DISABLE_MARKUP_WIKIWORD')); - - define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS'))); - - define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT')); - - define('UPLOAD_FILE_PATH', forge_get_config('groupdir_prefix').'/'.WIKI_NAME.'/www/uploads/'); - // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); - if ($project->isPublic()) { - define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/'); - } else { - define('UPLOAD_DATA_PATH', '/wiki/view.php/'.WIKI_NAME.'/uploads/'); - } - - // Do not use a directory per user but only one (per project) - define('UPLOAD_USERDIR', false); - - // Allow Load File only from /tmp - define('ALLOWED_LOAD', '/tmp'); - - // Use black list of extensions instead of white list - define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true); - - // Get the maximum upload filesize from PHP config - define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize'))); - - // Disable access log (already in Apache & FusionForge). - define('ACCESS_LOG_SQL', 0); - - define('DEBUG', (forge_get_config('installation_environment') != 'production')); - - // Postgresql - define('DATABASE_TYPE', 'SQL'); - // Dummy value (to avoid warning in SystemInfo plugin) - define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki'); - - // Disable VACUUM (they are performed every night) - define('DATABASE_OPTIMISE_FREQUENCY', 0); - - // TBD: the name should be taken from FusionForge - // define('ADMIN_USER', 'ACOS Forge Administrator'); - define('ADMIN_USER', 'The PhpWiki programming team'); - // Dummy value - define('ADMIN_PASSWD', 'xxx'); - - // Allow ".svg" and ".swf" as extensions - define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg|swf'); - - // Allow <div> and <span> in wiki code - define('ENABLE_MARKUP_DIVSPAN', true); - - define('ENABLE_AJAX', false); - - define('TOOLBAR_PAGELINK_PULLDOWN', false); - define('TOOLBAR_TEMPLATE_PULLDOWN', 'Template*'); - define('TOOLBAR_IMAGE_PULLDOWN', true); - - // Enable external pages - define('ENABLE_EXTERNAL_PAGES', $is_external); - - // Let all revisions be stored. Default since 1.3.11 - define('MAJOR_MIN_KEEP', 2147483647); - define('MINOR_MIN_KEEP', 2147483647); - define('MAJOR_MAX_AGE', 2147483647); - define('MAJOR_KEEP', 2147483647); - define('MINOR_MAX_AGE', 2147483647); - define('MINOR_KEEP', 2147483647); - define('AUTHOR_MAX_AGE', 2147483647); - define('AUTHOR_KEEP', 2147483647); - define('AUTHOR_MIN_AGE', 2147483647); - define('AUTHOR_MAX_KEEP', 2147483647); - - // - // Define access rights for the wiki. - // - - // Do not allow anon users to edit pages - define('ALLOW_ANON_EDIT', false); - - // Do not allow fake user - define('ALLOW_BOGO_LOGIN', false); - - // A dedicated auth has been created to get auth from FusionForge - $USER_AUTH_ORDER = array("FusionForge"); - define('USER_AUTH_ORDER', 'FusionForge'); - define('USER_AUTH_POLICY', 'strict'); - - define('EXTERNAL_LINK_TARGET', '_top'); - - // Override the default configuration for CONSTANTS before index.php - $LC_ALL = language_name_to_locale_code(choose_language_from_context()); - $LANG = preg_replace('/_.*/', '', $LC_ALL); - - // We use a local interwiki map file - define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map'); - - define('DEFAULT_WIKI_PAGES', ""); - - define('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) as ok FROM plugin_wiki_pref WHERE userid='\$userid'"); - define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid'"); - define('DBAUTH_AUTH_CREATE', "INSERT INTO plugin_wiki_pref (passwd,userid) VALUES ('\$password','\$userid')"); - define('DBAUTH_PREF_SELECT', "SELECT prefs FROM plugin_wiki_pref WHERE userid='\$userid'"); - define('DBAUTH_PREF_UPDATE', "UPDATE plugin_wiki_pref SET prefs='\$pref_blob' WHERE userid='\$userid'"); - define('DBAUTH_PREF_INSERT', "INSERT INTO plugin_wiki_pref (prefs,userid) VALUES ('\$pref_blob','\$userid')"); - define('DBAUTH_IS_MEMBER', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid' AND groupname='\$groupname'"); - define('DBAUTH_GROUP_MEMBERS', "SELECT userid FROM plugin_wiki_pref WHERE groupname='\$groupname'"); - define('DBAUTH_USER_GROUPS', "SELECT groupname FROM plugin_wiki_pref WHERE userid='\$userid'"); - - define('USE_DB_SESSION', true); - - define('USE_BYTEA', true); - - define('ENABLE_REVERSE_DNS', false); - - // Web DAV location - define('DEFAULT_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidump/"); - define('HTML_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidumphtml/"); - - define('COMPRESS_OUTPUT', false); - - define('CACHE_CONTROL', "NO_CACHE"); - - $lg = language_name_to_locale_code(forge_get_config('default_language')); - $lg = preg_replace('/_.*/', '', $lg); - define('DEFAULT_LANGUAGE', $lg); - - define('DISABLE_GETIMAGESIZE', true); - - // If the user is logged in, let the Wiki know - if (session_loggedin()) { - $user = session_get_user(); - if ($user && is_object($user) && !$user->isError() && $user->isActive()) { - $user_name = $user->getRealName(); - $_SESSION['user_id'] = $user_name; - $_SERVER['PHP_AUTH_USER'] = $user_name; - } - } else { - // clear out the globals, just in case... - } - - // Load the default configuration. - require_once(dirname(__FILE__).'/lib/prepend.php'); - require_once(dirname(__FILE__).'/lib/IniConfig.php'); - IniConfig(dirname(__FILE__)."/config/config-default.ini"); - - // Override the default configuration for VARIABLES after index.php: - // E.g. Use another DB: - $DBParams['dbtype'] = 'SQL'; - $DBParams['dsn'] = 'ffpgsql://' . forge_get_config('database_user') . ':' . - forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name'); - - $DBParams['prefix'] = "plugin_wiki_"; - - // Start the wiki - include dirname(__FILE__).'/lib/main.php'; -} - -/** - * Return a number of octets from a string like "300M" - */ -function octets($val) { - $val = trim($val); - $last = strtolower($val[strlen($val)-1]); - switch($last) { - // The 'G' modifier is available since PHP 5.1.0 - case 'g': - $val *= 1024; - case 'm': - $val *= 1024; - case 'k': - $val *= 1024; - } - return $val; -} Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2016-07-08 11:32:02 UTC (rev 9865) +++ trunk/pgsrc/ReleaseNotes 2016-07-08 11:34:55 UTC (rev 9866) @@ -1,4 +1,4 @@ -Date: Thu, 7 Jul 2016 22:43:03 +0000 +Date: Fri, 8 Jul 2016 13:33:33 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -22,6 +22,7 @@ * Add HTML 5 <main> <header> <footer> <nav> in all themes * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Repair PhotoAlbumPlugin +* Remove Fusionforge-specific files (g wikiadmin.php wikilist.php) == 1.5.5 2015-12-11 Marc-Etienne Vargenau == Deleted: trunk/wikiadmin.php =================================================================== --- trunk/wikiadmin.php 2016-07-08 11:32:02 UTC (rev 9865) +++ trunk/wikiadmin.php 2016-07-08 11:34:55 UTC (rev 9866) @@ -1,169 +0,0 @@ -<?php -/* - * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent - * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -/* - * Standard Alcatel-Lucent disclaimer for contributing to open source - * - * "The Wiki Configurator ("Contribution") has not been tested and/or - * validated for release as or in products, combinations with products or - * other commercial use. Any use of the Contribution is entirely made at - * the user's own responsibility and the user can not rely on any features, - * functionalities or performances Alcatel-Lucent has attributed to the - * Contribution. - * - * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY - * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE, - * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE - * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER - * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND - * ALONE BASIS." - */ - -require_once dirname(__FILE__) . "/../../env.inc.php"; -require_once $gfcommon . 'include/pre.php'; -require_once forge_get_config('plugins_path') . '/wiki/common/WikiPlugin.class.php'; -require_once forge_get_config('plugins_path') . '/wiki/common/wikiconfig.class.php'; - -$user = session_get_user(); // get the session user - -if (!$user || !is_object($user)) { - exit_error(_('Invalid User'), 'home'); -} elseif ($user->isError()) { - exit_error($user->getErrorMessage(), 'home'); -} elseif (!$user->isActive()) { - exit_error(_('User not active'), 'home'); -} - -$type = getStringFromRequest('type'); -$group_id = getIntFromRequest('group_id'); -$pluginname = 'wiki'; -$config = getArrayFromRequest('config'); - -if (!$type) { - exit_missing_param('', array(_('No TYPE specified')), 'home'); -} elseif (!$group_id) { - exit_missing_param('', array(_('No ID specified')), 'home'); -} else { - if ($type == 'admin_post') { - $group = group_get_object($group_id); - if (!$group) { - exit_no_group(); - } - if (!($group->usesPlugin($pluginname))) { //check if the group has the wiki plugin active - exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'), $pluginname), 'home'); - } - $userperm = $group->getPermission(); //we'll check if the user belongs to the group - if (!$userperm->IsMember()) { - exit_permission_denied(_('You are not a member of this project'), 'home'); - } - //only project admin can access here - if ($userperm->isAdmin()) { - - $wc = new WikiConfig($group_id); - - foreach ($wc->getWikiConfigNames() as $c) { - if (!array_key_exists($c, $config)) { - $config[$c] = 0; - } - } - - foreach ($config as $config_name => $config_value) { - $r = $wc->updateWikiConfig($config_name, $config_value); - if (!$r) exit_error("Error", $wc->getErrorMessage()); - } - - $type = 'admin'; - $feedback = _('Configuration saved.'); - } else { - exit_permission_denied(_('You are not a project Admin'), 'home'); - } - } - if ($type == 'admin') { - $group = group_get_object($group_id); - if (!$group) { - exit_no_group(); - } - if (!($group->usesPlugin($pluginname))) { //check if the group has the plugin active - exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'), $pluginname), 'home'); - } - $userperm = $group->getPermission(); //we'll check if the user belongs to the group - if (!$userperm->IsMember()) { - exit_permission_denied(_('You are not a member of this project'), 'home'); - } - //only project admin can access here - if ($userperm->isAdmin()) { - site_project_header(array('title' => _("Configuration for your project's wiki"), - 'pagename' => $pluginname, - 'group' => $group_id, - 'toptab' => 'wiki', - 'sectionvals' => array(group_getname($group_id)))); - - $wc = new WikiConfig($group_id); - - print "<table>\n"; - print "<tr>\n"; - print "<td>\n"; - print "<fieldset>\n"; - print "<legend>" . _('Wiki Configuration') . "</legend>\n"; - print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n"; - print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n"; - print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n"; - print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n"; - - print '<table class="listing">'; - print "\n<thead>\n<tr>\n<th>" . - _("Parameter") . - "</th>" . - "<th>" . - _("Value") . - "</th>\n" . - "</tr>\n</thead>\n"; - - foreach ($wc->getWikiConfigNames() as $c) { - $checked = $wc->getWikiConfig($c) ? ' checked="checked"' : ''; - $desc = $wc->getWikiConfigDescription($c); - - print "<tr>\n<td>$desc</td>\n" . - '<td class="align-center">' . - "<input type=\"checkbox\" name=\"config[$c]\" value=\"1\"$checked /></td>\n" . - "</tr>\n"; - } - print "</table>\n"; - print '<p class="align-right"><input type="submit" value="' . - _("Save Configuration") . - "\" /></p>"; - print "</form>\n"; - print "</fieldset>\n"; - print "</td>\n"; - print "</tr>\n"; - print "</table>\n"; - } else { - exit_permission_denied(_('You are not a project Admin'), 'home'); - } - } -} - -site_project_footer(); Deleted: trunk/wikilist.php =================================================================== --- trunk/wikilist.php 2016-07-08 11:32:02 UTC (rev 9865) +++ trunk/wikilist.php 2016-07-08 11:34:55 UTC (rev 9866) @@ -1,92 +0,0 @@ -<?php -/** - * List of active wikis in Forge - * - * Copyright 2009-2011 Marc-Etienne Vargenau, Alcatel-Lucent - * - * This file is part of FusionForge. - * - * FusionForge 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. - * - * FusionForge 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 FusionForge; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -require_once dirname(__FILE__) . "/../../env.inc.php"; -require_once $gfcommon . 'include/pre.php'; -require_once $gfwww . 'admin/admin_utils.php'; - -$title = _('List of active wikis in Forge'); -site_admin_header(array('title' => $title)); - -$sortorder = getStringFromRequest('sortorder', 'group_name'); -$sortorder = util_ensure_value_in_set($sortorder, array('group_name', 'register_time', 'unix_group_name', 'is_public', 'is_external', 'members')); - -$res = db_query_params('SELECT group_name,register_time,unix_group_name,groups.group_id,is_public,is_external,status, COUNT(user_group.group_id) AS members - FROM groups LEFT JOIN user_group ON user_group.group_id=groups.group_id - WHERE status=$1 - GROUP BY group_name,register_time,unix_group_name,groups.group_id,is_public,is_external,status - ORDER BY ' . $sortorder, - array('A')); - -$headers = array( - _('Project Name'), - _('Registered'), - _('Unix Name'), - _('Is Public?') -); -if (forge_get_config('allow_external')) { - $headers[] = _("External?"); -} -$headers[] = _('Members'); -$headers[] = _('Upgrade'); - -$headerLinks = array( - '/wiki/wikilist.php?sortorder=group_name', - '/wiki/wikilist.php?sortorder=register_time', - '/wiki/wikilist.php?sortorder=unix_group_name', - '/wiki/wikilist.php?sortorder=is_public'); -if (forge_get_config('allow_external')) { - $headerLinks[] = '?sortorder=is_external'; -} -$headerLinks[] = '/wiki/wikilist.php?sortorder=members'; -$headerLinks[] = ''; - -echo $HTML->listTableTop($headers, $headerLinks); - -$i = 0; -while ($grp = db_fetch_array($res)) { - - $project = group_get_object($grp['group_id']); - if ($project->usesPlugin("wiki")) { - $time_display = ""; - if ($grp['register_time'] != 0) { - $time_display = date('Y-m-d H:i', $grp['register_time']); - } - echo '<tr ' . $HTML->boxGetAltRowStyle($i) . '>'; - echo '<td><a href="/wiki/g/' . $grp['unix_group_name'] . '/">' . $grp['group_name'] . '</a></td>'; - echo '<td>' . $time_display . '</td>'; - echo '<td>' . $grp['unix_group_name'] . '</td>'; - echo '<td>' . $grp['is_public'] . '</td>'; - if (forge_get_config('allow_external')) { - echo '<td>' . $grp['is_external'] . '</td>'; - } - echo '<td>' . $grp['members'] . '</td>'; - echo '<td><a title="'._('Upgrade').' '.$grp['group_name'].'" href="/wiki/g/'.$grp['unix_group_name'].'/?action=upgrade&nodb=true">'._('Upgrade').'</a></td>'; - echo '</tr>'; - $i++; - } -} - -echo $HTML->listTableBottom(); - -site_admin_footer(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-19 14:29:52
|
Revision: 9886 http://sourceforge.net/p/phpwiki/code/9886 Author: vargenau Date: 2016-07-19 14:29:46 +0000 (Tue, 19 Jul 2016) Log Message: ----------- Add () in class instantiation Modified Paths: -------------- trunk/RPC2.php trunk/doc/README.foaf trunk/lib/BlockParser.php trunk/lib/ErrorManager.php trunk/lib/FileFinder.php trunk/lib/InlineParser.php trunk/lib/Request.php trunk/lib/RssWriter091.php trunk/lib/TextSearchQuery.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/editpage.php trunk/lib/imagecache.php trunk/lib/loadsave.php trunk/lib/pdf.php trunk/lib/plugin/Diff.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/prepend.php trunk/lib/upgrade.php trunk/themes/Sidebar/themeinfo.php trunk/themes/wikilens/templates/head.tmpl Modified: trunk/RPC2.php =================================================================== --- trunk/RPC2.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/RPC2.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -25,5 +25,5 @@ include_once 'lib/XmlRpcServer.php'; -$server = new XmlRpcServer; +$server = new XmlRpcServer(); $server->service(); Modified: trunk/doc/README.foaf =================================================================== --- trunk/doc/README.foaf 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/doc/README.foaf 2016-07-19 14:29:46 UTC (rev 9886) @@ -157,7 +157,7 @@ require_once 'XML/FOAF/Parser.php'; // Create new Parser object -$parser = new XML_FOAF_Parser; +$parser = new XML_FOAF_Parser(); // Start of output echo '<h1>XML_FOAF_Parser Example</h1>'; Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/BlockParser.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -100,7 +100,7 @@ return false; } - $match = new AnchoredRegexpSet_match; + $match = new AnchoredRegexpSet_match(); $match->postmatch = substr($text, strlen($m[0])); $match->match = $m[1]; $match->regexp_ind = count($m) - 3; @@ -139,7 +139,7 @@ return false; } - $match = new AnchoredRegexpSet_match; + $match = new AnchoredRegexpSet_match(); $match->postmatch = substr($text, strlen($m[0])); $match->match = $m[1]; $match->regexp_ind = count($m) - 3 + $prevMatch->regexp_ind + 1; Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/ErrorManager.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -355,7 +355,7 @@ } if (!isset($GLOBALS['ErrorManager'])) { - $GLOBALS['ErrorManager'] = new ErrorManager; + $GLOBALS['ErrorManager'] = new ErrorManager(); } if (defined('DEBUG') and DEBUG) { @@ -647,5 +647,5 @@ require_once(dirname(__FILE__) . '/HtmlElement.php'); if (!isset($GLOBALS['ErrorManager'])) { - $GLOBALS['ErrorManager'] = new ErrorManager; + $GLOBALS['ErrorManager'] = new ErrorManager(); } Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/FileFinder.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -350,7 +350,7 @@ * Example usage: * * <pre> - * $pearFinder = new PearFileFinder; + * $pearFinder = new PearFileFinder(); * $pearFinder->includeOnce('DB.php'); * </pre> * @@ -460,7 +460,7 @@ { static $finder; if (!isset($finder)) { - $finder = new FileFinder; + $finder = new FileFinder(); // remove "/lib" from dirname(__FILE__) $wikidir = preg_replace('/.lib$/', '', dirname(__FILE__)); // let the system favor its local pear? @@ -482,7 +482,7 @@ { static $finder; if ($re_init or !isset($finder)) - $finder = new LocalizedFileFinder; + $finder = new LocalizedFileFinder(); return $finder->findFile($file, $missing_okay); } @@ -490,7 +490,7 @@ { static $buttonfinder; if ($re_init or !isset($buttonfinder)) - $buttonfinder = new LocalizedButtonFinder; + $buttonfinder = new LocalizedButtonFinder(); return $buttonfinder->findFile($file, $missing_okay); } @@ -507,7 +507,7 @@ { static $finder; if (!isset($finder)) { - $finder = new FileFinder; + $finder = new FileFinder(); } // remove "/lib" from dirname(__FILE__) if ($finder->_is_abs($file)) @@ -529,7 +529,7 @@ { static $finder; if (!isset($finder)) { - $finder = new FileFinder; + $finder = new FileFinder(); } if (defined("DATA_PATH")) { $wikipath = DATA_PATH; Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/InlineParser.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -147,7 +147,7 @@ // S - STUDY private function _match($text, $regexps, $repeat) { - $match = new RegexpSet_match; + $match = new RegexpSet_match(); // Optimization: if the matches are only "$" and another, then omit "$" assert(!empty($repeat)); @@ -1244,7 +1244,7 @@ $regexps = new RegexpSet($regexps); $input = $text; - $output = new XmlContent; + $output = new XmlContent(); $match = $regexps->match($input); @@ -1343,7 +1343,7 @@ static $trfm; $action = $request->getArg('action'); if (empty($trfm) or $action == 'SpellCheck') { - $trfm = new InlineTransformer; + $trfm = new InlineTransformer(); } if ($basepage) { @@ -1357,7 +1357,7 @@ static $trfm; if (empty($trfm)) { - $trfm = new LinkTransformer; + $trfm = new LinkTransformer(); } if ($basepage) { @@ -1374,7 +1374,7 @@ static $trfm; if (empty($trfm)) { - $trfm = new NowikiTransformer; + $trfm = new NowikiTransformer(); } if ($basepage) { return new CacheableMarkup($trfm->parse($text), $basepage); Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/Request.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -48,8 +48,8 @@ break; } - $this->session = new Request_SessionVars; - $this->cookies = new Request_CookieVars; + $this->session = new Request_SessionVars(); + $this->cookies = new Request_CookieVars(); if (ACCESS_LOG or ACCESS_LOG_SQL) { $this->_accesslog = new Request_AccessLog(ACCESS_LOG, ACCESS_LOG_SQL); Modified: trunk/lib/RssWriter091.php =================================================================== --- trunk/lib/RssWriter091.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/RssWriter091.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -80,7 +80,7 @@ function format($changes) { // include_once('lib/RssWriter.php'); - $rss = new RssWriter091; + $rss = new RssWriter091(); $rss->channel($this->channel_properties()); Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/TextSearchQuery.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -107,7 +107,7 @@ $this->_regex_modifier = ($case_exact ? '' : 'i') . 'sS'; $this->_case_exact = $case_exact; if ($regex != 'pcre') { - $parser = new TextSearchQuery_Parser; + $parser = new TextSearchQuery_Parser(); $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex); $this->optimize(); // broken under certain circumstances: "word -word -word" if (defined("FULLTEXTSEARCH_STOPLIST")) Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/WikiDB/backend/PearDB.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -36,7 +36,7 @@ // TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(), // which is invalid for "select version()" if (!in_array($name, get_class_methods("DB_common"))) { - $finder = new FileFinder; + $finder = new FileFinder(); $dir = dirname(__FILE__) . "/../../pear"; $finder->_prepend_to_include_path($dir); include_once("$dir/DB/common.php"); // use our version instead. Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/WikiPluginCached.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -482,7 +482,7 @@ if (!class_exists('Cache')) { // uuh, pear not in include_path! should print a warning. // search some possible pear paths. - $pearFinder = new PearFileFinder; + $pearFinder = new PearFileFinder(); if ($lib = $pearFinder->findFile('Cache.php', 'missing_ok')) require_once($lib); else // fall back to our own copy Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/WikiTheme.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -240,8 +240,8 @@ $this->_default_theme = new WikiTheme('default', true); $this->_parents[] = $this->_default_theme; } elseif ($parent) { - $this->_parents[] = new WikiTheme - (preg_replace("/^WikiTheme_/i", "", $parent), true); + $this->_parents[] = new WikiTheme( + preg_replace("/^WikiTheme_/i", "", $parent), true); } } } Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/WikiUser.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -711,7 +711,7 @@ global $request; if (empty($this->_prefs)) - $this->_prefs = new UserPreferences; + $this->_prefs = new UserPreferences(); $UserName = $this->UserName(); // Try to read deprecated 1.3.x style cookies @@ -774,7 +774,7 @@ // initializeTheme() needs at least an empty object /* if (empty($this->_prefs)) - $this->_prefs = new UserPreferences; + $this->_prefs = new UserPreferences(); */ return $this->_prefs; } Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/editpage.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -215,7 +215,7 @@ $pagelink = WikiLink($this->page); } - $title = new FormattedText ($title_fs, $pagelink); + $title = new FormattedText($title_fs, $pagelink); // not for dumphtml or viewsource if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG and $template == 'editpage') { $WikiTheme->addMoreHeaders($this->WysiwygEdit->Head()); @@ -519,7 +519,7 @@ _("Versions are identical"))); } else { // New CSS formatted unified diffs - $fmt = new HtmlUnifiedDiffFormatter; + $fmt = new HtmlUnifiedDiffFormatter(); $html->pushContent($fmt->format($diff)); } return $html; Modified: trunk/lib/imagecache.php =================================================================== --- trunk/lib/imagecache.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/imagecache.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -93,7 +93,7 @@ */ function mainImageCache() { - $request = new Request; + $request = new Request(); // normalize pagename $request->setArg('pagename', deducePagename($request)); $pagename = $request->getArg('pagename'); @@ -111,7 +111,7 @@ $id = $request->getArg('id'); $args = $request->getArg('args'); $request->setArg('action', 'imagecache'); - $cache = new WikiPluginCached; + $cache = new WikiPluginCached(); if ($id) { // this indicates a direct call (script wasn't called as Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/loadsave.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -1516,7 +1516,7 @@ $dbi =& $request->_dbi; // Ensure that all mandatory pages are loaded - $finder = new FileFinder; + $finder = new FileFinder(); $mandatory = array('SandBox', 'Template/Category', Modified: trunk/lib/pdf.php =================================================================== --- trunk/lib/pdf.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/pdf.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -40,7 +40,7 @@ array_unshift($pagelist->_pages, $request->_dbi->getPage($pagename)); require_once 'lib/WikiPluginCached.php'; - $cache = new WikiPluginCached; + $cache = new WikiPluginCached(); $cache->newCache(); $tmpfile = $cache->tempnam(); $tmpdir = dirname($tmpfile); @@ -83,7 +83,7 @@ $request->discardOutput(); $request->buffer_output(false /*'nocompress'*/); require_once 'lib/WikiPluginCached.php'; - $cache = new WikiPluginCached; + $cache = new WikiPluginCached(); $cache->newCache(); $tmpfile = $cache->tempnam('pdf.html'); $fp = fopen($tmpfile, "wb"); Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/Diff.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -193,7 +193,7 @@ _(" was created because: "), $new->get('summary'))); } } else { - $fmt = new HtmlUnifiedDiffFormatter; + $fmt = new HtmlUnifiedDiffFormatter(); $html->pushContent($fmt->format($diff)); } } Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/FoafViewer.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -134,7 +134,7 @@ return HTML(HTML::p(_("Resource isn't available: Something went wrong, probably a 404!"))); } // Create new Parser object - $parser = new XML_FOAF_Parser; + $parser = new XML_FOAF_Parser(); // Parser FOAF into $foaffile $parser->parseFromMem($foaffile); $a = $parser->toArray(); Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/LikePages.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -94,7 +94,7 @@ if ($search) $query = new TextSearchQuery(join(' OR ', $search)); else - $query = new NullTextSearchQuery; // matches nothing + $query = new NullTextSearchQuery(); // matches nothing $match_re = '/' . join('|', $match) . '/'; Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/RecentChanges.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -841,7 +841,7 @@ { include_once 'lib/RssWriter.php'; - $rss = new RssWriter; + $rss = new RssWriter(); $rss->channel($this->channel_properties()); if (($props = $this->image_properties())) @@ -959,7 +959,7 @@ function format($changes) { include_once 'lib/RssWriter2.php'; - $rss = new RssWriter2; + $rss = new RssWriter2(); $rss->channel($this->channel_properties()); if (($props = $this->cloud_properties())) @@ -1031,7 +1031,7 @@ { global $request; include_once 'lib/RssWriter.php'; - $rss = new AtomFeed; + $rss = new AtomFeed(); // "channel" is called "feed" in atom $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl'); Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/SpellCheck.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -143,7 +143,7 @@ $args .= " --lang=" . $lang; // use -C or autosplit wikiwords in the text $commandLine = ASPELL_EXE . " -a -C $args "; - $cache = new WikiPluginCached; + $cache = new WikiPluginCached(); $code = $cache->filterThroughCmd($source, $commandLine); if (empty($code)) return $this->error(fmt("Couldn't start commandline “%s”", $commandLine)); Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/plugin/WikiAdminRename.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -129,13 +129,12 @@ /*if ($next_action == 'verify') { $args['info'] = "checkbox,pagename,renamed_pagename"; }*/ - $pagelist = new PageList_Selectable - ( + $pagelist = new PageList_Selectable( $args['info'], $args['exclude'], array('types' => array('renamed_pagename' => new _PageList_Column_renamed_pagename('rename', _("Rename to")), - ))); + ))); $pagelist->addPageList($pages); $header = HTML::div(); Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/prepend.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -104,7 +104,7 @@ } } -$RUNTIMER = new DebugTimer; +$RUNTIMER = new DebugTimer(); require_once(dirname(__FILE__) . '/ErrorManager.php'); require_once(dirname(__FILE__) . '/WikiCallback.php'); Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/lib/upgrade.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -990,8 +990,8 @@ { echo "<h2>", sprintf(_("Check for necessary %s updates"), "config.ini"), "</h2>\n"; - $entry = new UpgradeConfigEntry - ($this, array('key' => 'cache_control_none', + $entry = new UpgradeConfigEntry($this, + array('key' => 'cache_control_none', 'fixed_with' => 1012.0, 'header' => sprintf(_("Check for %s"), "CACHE_CONTROL = NONE"), 'applicable_args' => 'CACHE_CONTROL', @@ -1000,8 +1000,8 @@ $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty')); $this->_configUpdates[] = $entry; - $entry = new UpgradeConfigEntry - ($this, array('key' => 'group_method_none', + $entry = new UpgradeConfigEntry($this, + array('key' => 'group_method_none', 'fixed_with' => 1012.0, 'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"), 'applicable_args' => 'GROUP_METHOD', @@ -1010,8 +1010,8 @@ $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty')); $this->_configUpdates[] = $entry; - $entry = new UpgradeConfigEntry - ($this, array('key' => 'blog_empty_default_prefix', + $entry = new UpgradeConfigEntry($this, + array('key' => 'blog_empty_default_prefix', 'fixed_with' => 1013.0, 'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"), 'applicable_args' => 'BLOG_EMPTY_DEFAULT_PREFIX', Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/themes/Sidebar/themeinfo.php 2016-07-19 14:29:46 UTC (rev 9886) @@ -204,7 +204,7 @@ require_once 'lib/wikilens/CustomPrefs.php'; require_once 'lib/wikilens/PageListColumns.php'; //require_once("lib/plugin/RateIt.php"); - $plugin = new WikiPlugin_RateIt; + $plugin = new WikiPlugin_RateIt(); // add parent to current theme to find the RateIt images // $WikiTheme->addParent('wikilens', 'noinit'); $WikiTheme->_parents[] = new WikiTheme('wikilens', 'noinit'); Modified: trunk/themes/wikilens/templates/head.tmpl =================================================================== --- trunk/themes/wikilens/templates/head.tmpl 2016-07-19 14:28:36 UTC (rev 9885) +++ trunk/themes/wikilens/templates/head.tmpl 2016-07-19 14:29:46 UTC (rev 9886) @@ -89,7 +89,7 @@ <?php } ?> <?php require_once("lib/plugin/RateIt.php"); - $plugin = new WikiPlugin_RateIt; + $plugin = new WikiPlugin_RateIt(); $plugin->head(); ?> <?php echo $WikiTheme->getMoreHeaders() ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-21 09:51:19
|
Revision: 9895 http://sourceforge.net/p/phpwiki/code/9895 Author: vargenau Date: 2016-07-21 09:51:17 +0000 (Thu, 21 Jul 2016) Log Message: ----------- Remove unused lib/PageList.php Modified Paths: -------------- trunk/lib/PageList.php trunk/locale/Makefile Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2016-07-21 09:43:11 UTC (rev 9894) +++ trunk/lib/PageList.php 2016-07-21 09:51:17 UTC (rev 9895) @@ -178,7 +178,7 @@ class _PageList_Column extends _PageList_Column_base { - function _PageList_Column($field, $default_heading, $align = false) + function __construct($field, $default_heading, $align = false) { parent::__construct($default_heading, $align); Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2016-07-21 09:43:11 UTC (rev 9894) +++ trunk/locale/Makefile 2016-07-21 09:51:17 UTC (rev 9895) @@ -83,7 +83,6 @@ ${POT_FILE}: .././lib/Captcha.php ${POT_FILE}: .././lib/config.php ${POT_FILE}: .././lib/DbaDatabase.php -${POT_FILE}: .././lib/DbaListSet.php ${POT_FILE}: .././lib/DbaPartition.php ${POT_FILE}: .././lib/DbSession/ADODB.php ${POT_FILE}: .././lib/DbSession/dba.php @@ -568,7 +567,7 @@ ${POT_FILE}: .././lib/removepage.php ${POT_FILE}: .././lib/Request.php ${POT_FILE}: .././lib/RssParser.php -${POT_FILE}: .././lib/RSSWriter091.php +${POT_FILE}: .././lib/RssWriter091.php ${POT_FILE}: .././lib/RssWriter2.php ${POT_FILE}: .././lib/RssWriter.php ${POT_FILE}: .././lib/SemanticWeb.php @@ -819,5 +818,3 @@ ${POT_FILE}: .././themes/Wordpress/themeinfo.php ${POT_FILE}: .././uploads/index.php ${POT_FILE}: .././view.php -${POT_FILE}: .././wikiadmin.php -${POT_FILE}: .././wikilist.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-27 14:58:53
|
Revision: 9914 http://sourceforge.net/p/phpwiki/code/9914 Author: vargenau Date: 2016-07-27 14:58:50 +0000 (Wed, 27 Jul 2016) Log Message: ----------- Rename action page DebugInfo as DebugBackendInfo (to be consistent with plugin name) Modified Paths: -------------- trunk/lib/IniConfig.php trunk/lib/plugin/WikiTranslation.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 trunk/locale/zh/pgsrc/Help%2FWikiPlugin trunk/pgsrc/DebugBackendInfo trunk/pgsrc/Help%2FDebugBackendInfoPlugin trunk/pgsrc/ReleaseNotes trunk/themes/Crao/templates/actionbar.tmpl trunk/themes/MonoBook/templates/info.tmpl trunk/themes/Portland/templates/actionbar.tmpl trunk/themes/Wordpress/templates/actionbar.tmpl trunk/themes/default/templates/actionbar.tmpl trunk/themes/smaller/templates/info.tmpl Added Paths: ----------- trunk/locale/de/pgsrc/DebugBackendInfo trunk/locale/zh/pgsrc/DebugBackendInfo Removed Paths: ------------- trunk/locale/de/pgsrc/DebugInfo trunk/locale/zh/pgsrc/DebugInfo trunk/pgsrc/DebugInfo Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/lib/IniConfig.php 2016-07-27 14:58:50 UTC (rev 9914) @@ -583,7 +583,7 @@ // The FUSIONFORGE theme omits them if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // Add some some action pages - $ActionPages[] = 'DebugInfo'; + $ActionPages[] = 'DebugBackendInfo'; $ActionPages[] = 'SpellCheck'; // SpellCheck does not work $ActionPages[] = 'EditMetaData'; $ActionPages[] = 'InterWikiSearch'; Modified: trunk/lib/plugin/WikiTranslation.php =================================================================== --- trunk/lib/plugin/WikiTranslation.php 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/lib/plugin/WikiTranslation.php 2016-07-27 14:58:50 UTC (rev 9914) @@ -83,7 +83,7 @@ _("CreateTocPlugin") . ',' . _("CurrentTime") . ',' . _("DeadEndPages") . ',' . - _("DebugInfo") . ',' . + _("DebugBackendInfo") . ',' . _("Diff") . ',' . _("DynamicIncludePage") . ',' . _("EditMetaData") . ',' . Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/lib/upgrade.php 2016-07-27 14:58:50 UTC (rev 9914) @@ -128,8 +128,6 @@ $this->_rename_page_helper("Help/_BackendInfoPlugin", "Help/DebugBackendInfoPlugin"); $this->_rename_page_helper("Help/_WikiTranslationPlugin", "Help/WikiTranslationPlugin"); $this->_rename_page_helper("Help/Advice Mediawiki users", "Help/Advice for Mediawiki users"); - // this is in some templates. so we keep the old name - //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo")); $this->_rename_page_helper("_GroupInfo", "GroupAuthInfo"); //never officially existed $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Copied: trunk/locale/de/pgsrc/DebugBackendInfo (from rev 9913, trunk/locale/de/pgsrc/DebugInfo) =================================================================== --- trunk/locale/de/pgsrc/DebugBackendInfo (rev 0) +++ trunk/locale/de/pgsrc/DebugBackendInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -0,0 +1,11 @@ +Date: Wed, 27 Jul 2016 16:49:22 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Content-Type: application/x-phpwiki; + pagename=DebugBackendInfo; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +Detailansicht der Seite. Das ist wahrscheinlich sinnvoller zum Debuggen als alles andere. + +<<DebugBackendInfo page||='' >> Deleted: trunk/locale/de/pgsrc/DebugInfo =================================================================== --- trunk/locale/de/pgsrc/DebugInfo 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/de/pgsrc/DebugInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,10 +0,0 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) -Content-Type: application/x-phpwiki; - pagename=DebugInfo; - flags=PAGE_LOCKED; - charset=UTF-8 -Content-Transfer-Encoding: binary - -Detailansicht der Seite. Das ist wahrscheinlich sinnvoller zum Debuggen als alles andere. -<<DebugBackendInfo page||='' >> 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 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/de.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\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." @@ -4054,9 +4054,6 @@ msgid "DeadEndPages" msgstr "VerwaisteSeiten" -msgid "DebugInfo" -msgstr "DebugInfo" - msgid "Diff" msgstr "Diff" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/es.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -3895,7 +3895,7 @@ msgstr "" msgid "DebugBackendInfo" -msgstr "DebugBackendInfo" +msgstr "" msgid "BackLinks" msgstr "AcoplamientosTraseros" @@ -3951,9 +3951,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "" - msgid "Diff" msgstr "Diferencia" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/fr.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\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." @@ -4024,9 +4024,6 @@ msgid "DeadEndPages" msgstr "PagesEnImpasse" -msgid "DebugInfo" -msgstr "InfosDeDébogage" - msgid "Diff" msgstr "Différences" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/it.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\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" @@ -3860,7 +3860,7 @@ msgstr "" msgid "DebugBackendInfo" -msgstr "DebugBackendInfo" +msgstr "" msgid "BackLinks" msgstr "" @@ -3916,9 +3916,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "InfoDebug" - msgid "Diff" msgstr "Differenze" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/ja.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3926,9 +3926,8 @@ msgid "AuthorHistoryPlugin" msgstr "編集者:" -#, fuzzy msgid "DebugBackendInfo" -msgstr "ページ情報" +msgstr "デバグ情報" msgid "BackLinks" msgstr "" @@ -3995,9 +3994,6 @@ msgid "DeadEndPages" msgstr "ランダムページ" -msgid "DebugInfo" -msgstr "デバグ情報" - msgid "Diff" msgstr "差分" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/nl.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -3906,9 +3906,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "" - msgid "Diff" msgstr "Diff" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/phpwiki.pot 2016-07-27 14:58:50 UTC (rev 9914) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3898,9 +3898,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "" - msgid "Diff" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/sv.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -3899,9 +3899,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "" - msgid "Diff" msgstr "Diff" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/po/zh.po 2016-07-27 14:58:50 UTC (rev 9914) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-27 14:23+0200\n" +"POT-Creation-Date: 2016-07-27 16:54+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -4083,9 +4083,6 @@ msgid "DeadEndPages" msgstr "" -msgid "DebugInfo" -msgstr "" - msgid "Diff" msgstr "差異" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Copied: trunk/locale/zh/pgsrc/DebugBackendInfo (from rev 9913, trunk/locale/zh/pgsrc/DebugInfo) =================================================================== --- trunk/locale/zh/pgsrc/DebugBackendInfo (rev 0) +++ trunk/locale/zh/pgsrc/DebugBackendInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -0,0 +1,11 @@ +Date: Wed, 27 Jul 2016 16:49:22 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Content-Type: application/x-phpwiki; + pagename=DebugBackendInfo; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +頁面的詳細資料,對於除錯非常有用. + +<<DebugBackendInfo page||='' >> Deleted: trunk/locale/zh/pgsrc/DebugInfo =================================================================== --- trunk/locale/zh/pgsrc/DebugInfo 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/zh/pgsrc/DebugInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,11 +0,0 @@ -Date: Thu, 10 Dec 2015 18:48:01 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) -Content-Type: application/x-phpwiki; - pagename=DebugInfo; - flags=PAGE_LOCKED; - charset=UTF-8 -Content-Transfer-Encoding: binary - -頁面的詳細資料,對於除錯非常有用. - -<<DebugBackendInfo page||='' >> Modified: trunk/locale/zh/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/locale/zh/pgsrc/Help%2FWikiPlugin 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/locale/zh/pgsrc/Help%2FWikiPlugin 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,4 +1,4 @@ -Date: Thu, 10 Dec 2015 18:48:01 +0000 +Date: Wed, 27 Jul 2016 16:46:26 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; @@ -9,7 +9,7 @@ The latest hacks include support for ~WikiPlugins. ~WikiPlugins 可以讓人簡單地為 wiki 頁面增加新的動態內容種類 (像是其他的功能). -在這個 wiki 之中, RecentChanges, BackLinks, LikePages 和 DebugInfo 頁面都是 +在這個 wiki 之中, RecentChanges, BackLinks, LikePages 和 DebugBackendInfo 頁面都是 使用 plugins 來實作的. 我期盼搜尋結果頁面或是 PhpWikiAdministration 等能夠很快地以 plugin 形式被實 @@ -66,7 +66,7 @@ * BackLinks * CalendarPlugin -* DebugInfo +* DebugBackendInfo * FullTextSearch * IncludePage * LikePages Modified: trunk/pgsrc/DebugBackendInfo =================================================================== --- trunk/pgsrc/DebugBackendInfo 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/pgsrc/DebugBackendInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,4 +1,4 @@ -Date: Thu, 10 Dec 2015 18:48:03 +0000 +Date: Wed, 27 Jul 2016 16:49:22 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=DebugBackendInfo; @@ -7,4 +7,9 @@ charset=UTF-8 Content-Transfer-Encoding: binary -<<DebugBackendInfo>> +Detailed view of a page, which is probably more useful for debugging than anything else. + +<<DebugBackendInfo page||=''>> + +---- +[[CategoryActionPage]] Deleted: trunk/pgsrc/DebugInfo =================================================================== --- trunk/pgsrc/DebugInfo 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/pgsrc/DebugInfo 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,16 +0,0 @@ -Date: Thu, 10 Dec 2015 18:48:03 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) -Content-Type: application/x-phpwiki; - pagename=DebugInfo; - 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 - -Detailed view of a page, which is probably more useful for debugging -than anything else. - -<<DebugBackendInfo page||=''>> - ----- -[[CategoryActionPage]] Modified: trunk/pgsrc/Help%2FDebugBackendInfoPlugin =================================================================== --- trunk/pgsrc/Help%2FDebugBackendInfoPlugin 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/pgsrc/Help%2FDebugBackendInfoPlugin 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,4 +1,4 @@ -Date: Thu, 10 Dec 2015 18:48:03 +0000 +Date: Wed, 27 Jul 2016 16:49:22 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=Help%2FDebugBackendInfoPlugin; @@ -38,13 +38,12 @@ == Example == -See [[DebugInfo]] +See [[DebugBackendInfo]] == Author == * [[Help:Jeff Dairiki|Jeff Dairiki]] == See Also == -* [[DebugInfo]] is the corresponding [[Help:ActionPage]] * [[EditMetaData]] * [[Help:EditMetaDataPlugin]] * [[Help:DebugAuthInfoPlugin]] Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/pgsrc/ReleaseNotes 2016-07-27 14:58:50 UTC (rev 9914) @@ -1,4 +1,4 @@ -Date: Fri, 8 Jul 2016 18:05:21 +0000 +Date: Wed, 27 Jul 2016 16:49:22 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -28,6 +28,7 @@ ** ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge ** Use jquery.autoheight.js plugin for Transclude plugin ** Repair [[Help:PhotoAlbumPlugin|PhotoAlbumPlugin]] +** Rename action page ~DebugInfo as ~DebugBackendInfo (to be consistent with plugin name) == 1.5.5 2015-12-11 Marc-Etienne Vargenau == Modified: trunk/themes/Crao/templates/actionbar.tmpl =================================================================== --- trunk/themes/Crao/templates/actionbar.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/Crao/templates/actionbar.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -26,7 +26,7 @@ <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> -<?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> +<?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> <?php $purgeb = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/MonoBook/templates/info.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -176,7 +176,7 @@ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> + <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); Modified: trunk/themes/Portland/templates/actionbar.tmpl =================================================================== --- trunk/themes/Portland/templates/actionbar.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/Portland/templates/actionbar.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -12,6 +12,6 @@ <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> <?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?> - <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> <?php // For debugging only, really ?> + <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> <?php } ?> <br /> Modified: trunk/themes/Wordpress/templates/actionbar.tmpl =================================================================== --- trunk/themes/Wordpress/templates/actionbar.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/Wordpress/templates/actionbar.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -71,7 +71,7 @@ <li> <?php echo Button("PageInfo", _("PageInfo")) ?> </li> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <li> - <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> <?php // For debugging only, really ?> + <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> </li> <?php } ?> Modified: trunk/themes/default/templates/actionbar.tmpl =================================================================== --- trunk/themes/default/templates/actionbar.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/default/templates/actionbar.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -28,7 +28,7 @@ <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> + <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> <?php if (DEBUG & _DEBUG_SQL and USECACHE) { Modified: trunk/themes/smaller/templates/info.tmpl =================================================================== --- trunk/themes/smaller/templates/info.tmpl 2016-07-27 14:14:20 UTC (rev 9913) +++ trunk/themes/smaller/templates/info.tmpl 2016-07-27 14:58:50 UTC (rev 9914) @@ -10,7 +10,7 @@ <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> + <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-28 15:21:26
|
Revision: 9922 http://sourceforge.net/p/phpwiki/code/9922 Author: vargenau Date: 2016-07-28 15:21:24 +0000 (Thu, 28 Jul 2016) Log Message: ----------- WikiPollPlugin: move syntax from source code to help page Modified Paths: -------------- trunk/lib/plugin/WikiPoll.php trunk/pgsrc/Help%2FWikiPollPlugin Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2016-07-28 15:13:14 UTC (rev 9921) +++ trunk/lib/plugin/WikiPoll.php 2016-07-28 15:21:24 UTC (rev 9922) @@ -20,30 +20,10 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + /** * This plugin provides configurable polls. * - * Usage: -<<WikiPoll require_all=0 require_least=2 -question[1]="Do you like PhpWiki?" -answer[1][1]="Yes" answer[1][2]="Do not know" answer[1][3]="No" -question[2]="Do you have PhpWiki installed by your own?" -answer[2][1]="Yes" answer[2][2]="No" -question[3]="Did you install any other wiki engine?" -answer[3][1]="Yes" answer[3][2]="No" -question[4]="What wiki engine do you like most?" -answer[4][1]="c2Wiki" answer[4][2]="MoinMoin" answer[4][3]="PhpWiki" -answer[4][4]="usemod" answer[4][5]="Twiki" answer[4][5]="guiki" -answer[4][6]="Mediawiki" answer[4][7]="Other" -question[5]="Which PhpWiki version do you use?" -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" ->> - * - * Administration: - * <<WikiPoll page=PhpWikiPoll admin=1 >> - * and protect this page properly (e.g. PhpWikiPoll/Admin) - * * TODO: * admin page (view and reset statistics) * for now only radio, support checkboxes (multiple selections) also? Modified: trunk/pgsrc/Help%2FWikiPollPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPollPlugin 2016-07-28 15:13:14 UTC (rev 9921) +++ trunk/pgsrc/Help%2FWikiPollPlugin 2016-07-28 15:21:24 UTC (rev 9922) @@ -1,4 +1,4 @@ -Date: Thu, 10 Dec 2015 18:48:03 +0000 +Date: Thu, 28 Jul 2016 17:20:10 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPollPlugin; @@ -9,12 +9,25 @@ The **~WikiPoll** [[Help:WikiPlugin|plugin]] provides configurable polls. == Usage == + {{{ <<WikiPoll arguments - questions + questions and possible answers >> }}} +Syntax: +{{{ +question[1]="Do you like PhpWiki?" +answer[1][1]="Yes" answer[1][2]="Do not know" answer[1][3]="No" +}}} + +Administration: +{{{ +<<WikiPoll page=PhpWikiPoll admin=1>> +}}} +and protect this page properly (e.g. ~PhpWikiPoll/Admin) + == Arguments == {| class="bordered" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-29 09:24:15
|
Revision: 9925 http://sourceforge.net/p/phpwiki/code/9925 Author: vargenau Date: 2016-07-29 09:24:12 +0000 (Fri, 29 Jul 2016) Log Message: ----------- Remove markup indication in pgsrc files Modified Paths: -------------- trunk/doc/README.security trunk/locale/README trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/themes/blog/pgsrc/About trunk/themes/blog/pgsrc/Blog trunk/themes/blog/pgsrc/BlogArchives trunk/themes/blog/pgsrc/CategoryHowTo trunk/themes/blog/pgsrc/HomePage trunk/themes/blog/pgsrc/HowTo trunk/themes/blog/pgsrc/PhotoAlbum trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates trunk/themes/fusionforge/pgsrc/CategoryWiki%20user trunk/themes/fusionforge/pgsrc/ExternalPages trunk/themes/fusionforge/pgsrc/FindPage trunk/themes/fusionforge/pgsrc/HomePage trunk/themes/fusionforge/pgsrc/InterWikiMap trunk/themes/fusionforge/pgsrc/PhpWikiAdministration trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple trunk/themes/fusionforge/pgsrc/SpecialPages trunk/themes/fusionforge/pgsrc/TextFormattingRules trunk/themes/fusionforge/pgsrc/UpLoad trunk/themes/fusionforge/pgsrc/colorbox trunk/themes/fusionforge/pgsrc/titlebar trunk/themes/wikilens/pgsrc/LeftbarContent Modified: trunk/doc/README.security =================================================================== --- trunk/doc/README.security 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/doc/README.security 2016-07-29 09:24:12 UTC (rev 9925) @@ -158,7 +158,6 @@ lastmodified=1104916186; created=1104916186; author_id=The%20PhpWiki%20programming%20team; - markup=2; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Modified: trunk/locale/README =================================================================== --- trunk/locale/README 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/locale/README 2016-07-29 09:24:12 UTC (rev 9925) @@ -200,7 +200,6 @@ Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/locale/es/pgsrc/Ayuda%2FKBrown =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FKBrown 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/locale/es/pgsrc/Ayuda%2FKBrown 2016-07-29 09:24:12 UTC (rev 9925) @@ -4,7 +4,6 @@ pagename=Ayuda%2FKBrown; flags=""; charset=UTF-8; - markup=1 Content-Transfer-Encoding: binary Puse mi mejor esfuerzo para traducir esta página al español. Modified: trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto 2016-07-29 09:24:12 UTC (rev 9925) @@ -4,7 +4,6 @@ pagename=Ayuda%2FReglasDeFormatoDeTexto; flags=PAGE_LOCKED; charset=UTF-8; - markup=1 Content-Transfer-Encoding: binary ! Sinopsis Modified: trunk/themes/blog/pgsrc/About =================================================================== --- trunk/themes/blog/pgsrc/About 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/About 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=About; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/Blog =================================================================== --- trunk/themes/blog/pgsrc/Blog 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/Blog 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=Blog; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/BlogArchives =================================================================== --- trunk/themes/blog/pgsrc/BlogArchives 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/BlogArchives 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=BlogArchives; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/CategoryHowTo =================================================================== --- trunk/themes/blog/pgsrc/CategoryHowTo 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/CategoryHowTo 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=CategoryHowTo; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/HomePage =================================================================== --- trunk/themes/blog/pgsrc/HomePage 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/HomePage 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=HomePage; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/HowTo =================================================================== --- trunk/themes/blog/pgsrc/HowTo 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/HowTo 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=HomePage; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/blog/pgsrc/PhotoAlbum =================================================================== --- trunk/themes/blog/pgsrc/PhotoAlbum 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/blog/pgsrc/PhotoAlbum 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=PhotoAlbum; flags=""; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates =================================================================== --- trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=CategoryWiki%20templates; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/CategoryWiki%20user =================================================================== --- trunk/themes/fusionforge/pgsrc/CategoryWiki%20user 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/CategoryWiki%20user 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=CategoryWiki%20user; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/ExternalPages =================================================================== --- trunk/themes/fusionforge/pgsrc/ExternalPages 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/ExternalPages 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=ExternalPages; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/FindPage =================================================================== --- trunk/themes/fusionforge/pgsrc/FindPage 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/FindPage 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=FindPage; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/HomePage =================================================================== --- trunk/themes/fusionforge/pgsrc/HomePage 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/HomePage 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=HomePage; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/InterWikiMap =================================================================== --- trunk/themes/fusionforge/pgsrc/InterWikiMap 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/InterWikiMap 2016-07-29 09:24:12 UTC (rev 9925) @@ -4,7 +4,6 @@ pagename=InterWikiMap; pagetype=interwikimap; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration =================================================================== --- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration; flags=PAGE_LOCKED; - markup=2; acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY"; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple =================================================================== --- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration%2FSetAclSimple; flags=PAGE_LOCKED; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal =================================================================== --- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration%2FSetExternal; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple =================================================================== --- trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=SetGlobalAccessRightsSimple; flags=PAGE_LOCKED; - markup=2; acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY"; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/SpecialPages =================================================================== --- trunk/themes/fusionforge/pgsrc/SpecialPages 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/SpecialPages 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=SpecialPages; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/TextFormattingRules =================================================================== --- trunk/themes/fusionforge/pgsrc/TextFormattingRules 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/TextFormattingRules 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=TextFormattingRules; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/UpLoad =================================================================== --- trunk/themes/fusionforge/pgsrc/UpLoad 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/UpLoad 2016-07-29 09:24:12 UTC (rev 9925) @@ -2,7 +2,6 @@ Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) Content-Type: application/x-phpwiki; pagename=UpLoad; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/colorbox =================================================================== --- trunk/themes/fusionforge/pgsrc/colorbox 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/colorbox 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=colorbox; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/fusionforge/pgsrc/titlebar =================================================================== --- trunk/themes/fusionforge/pgsrc/titlebar 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/fusionforge/pgsrc/titlebar 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=titlebar; flags=EXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary Modified: trunk/themes/wikilens/pgsrc/LeftbarContent =================================================================== --- trunk/themes/wikilens/pgsrc/LeftbarContent 2016-07-29 09:04:01 UTC (rev 9924) +++ trunk/themes/wikilens/pgsrc/LeftbarContent 2016-07-29 09:24:12 UTC (rev 9925) @@ -3,7 +3,6 @@ Content-Type: application/x-phpwiki; pagename=LeftbarContent; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - markup=2; charset=UTF-8 Content-Transfer-Encoding: binary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-10-10 12:38:51
|
Revision: 9953 http://sourceforge.net/p/phpwiki/code/9953 Author: vargenau Date: 2016-10-10 12:38:48 +0000 (Mon, 10 Oct 2016) Log Message: ----------- Add SPDX-License-Identifier Modified Paths: -------------- trunk/configurator.php trunk/index.php trunk/passencrypt.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2016-10-10 12:36:44 UTC (rev 9952) +++ trunk/configurator.php 2016-10-10 12:38:48 UTC (rev 9953) @@ -1,8 +1,8 @@ <?php -/* - * Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam - * Copyright 2002 Martin Geisler <gim...@gi...> - * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam + * Copyright © 2002 Martin Geisler <gim...@gi...> + * Copyright © 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * Parts of this file were based on PHPWeather's configurator.php file. @@ -21,6 +21,9 @@ * 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. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/index.php =================================================================== --- trunk/index.php 2016-10-10 12:36:44 UTC (rev 9952) +++ trunk/index.php 2016-10-10 12:38:48 UTC (rev 9953) @@ -1,6 +1,6 @@ <?php -/* - * Copyright 1999-2010 $ThePhpWikiProgrammingTeam +/** + * Copyright © 1999-2010 $ThePhpWikiProgrammingTeam * = array( * "Steve Wainstead", "Clifford A. Adams", "Lawrence Akka", * "Scott R. Anderson", "Jon Åslund", "Neil Brown", "Jeff Dairiki", @@ -26,6 +26,9 @@ * 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. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once (dirname(__FILE__) . '/lib/prepend.php'); Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2016-10-10 12:36:44 UTC (rev 9952) +++ trunk/passencrypt.php 2016-10-10 12:38:48 UTC (rev 9953) @@ -4,7 +4,7 @@ <meta charset="UTF-8" /> <title>Password Encryption Tool</title> <!-- - Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam This file is part of PhpWiki. @@ -21,6 +21,9 @@ 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. + + SPDX-License-Identifier: GPL-2.0+ + --> </head> <body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-10-10 12:48:47
|
Revision: 9954 http://sourceforge.net/p/phpwiki/code/9954 Author: vargenau Date: 2016-10-10 12:48:45 +0000 (Mon, 10 Oct 2016) Log Message: ----------- Add standard file header Modified Paths: -------------- trunk/ImageTile.php trunk/RPC2.php trunk/SOAP.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2016-10-10 12:38:48 UTC (rev 9953) +++ trunk/ImageTile.php 2016-10-10 12:48:45 UTC (rev 9954) @@ -1,4 +1,27 @@ <?php +/** + * Copyright © 2005,2007 Reini Urban + * + * 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. + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ + // FIXME! This is a mess. Everything. require_once 'lib/stdlib.php'; Modified: trunk/RPC2.php =================================================================== --- trunk/RPC2.php 2016-10-10 12:38:48 UTC (rev 9953) +++ trunk/RPC2.php 2016-10-10 12:48:45 UTC (rev 9954) @@ -1,4 +1,29 @@ <?php +/** + * Copyright © 2002 Lawrence Akka + * Copyright © 2002 Jeff Dairiki + * Copyright © 2005,2007 Reini Urban + * + * 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. + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ + /* * The guts of this code have been moved to lib/XmlRpcServer.php. * Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2016-10-10 12:38:48 UTC (rev 9953) +++ trunk/SOAP.php 2016-10-10 12:48:45 UTC (rev 9954) @@ -1,5 +1,29 @@ <?php /** + * Copyright © 2004-2005,2007 Reini Urban + * Copyright © 2011-2015 Marc-Etienne Vargenau, Alcatel-Lucent + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * PhpWiki is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with PhpWiki; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ + +/** * SOAP server * Taken from http://www.wlug.org.nz/archive/ * Please see http://phpwiki.sourceforge.net/phpwiki/PhpWiki.wdsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-10-10 13:05:44
|
Revision: 9955 http://sourceforge.net/p/phpwiki/code/9955 Author: vargenau Date: 2016-10-10 13:05:42 +0000 (Mon, 10 Oct 2016) Log Message: ----------- No space at EOL Modified Paths: -------------- trunk/lib/Google.php trunk/passencrypt.php Modified: trunk/lib/Google.php =================================================================== --- trunk/lib/Google.php 2016-10-10 12:48:45 UTC (rev 9954) +++ trunk/lib/Google.php 2016-10-10 13:05:42 UTC (rev 9955) @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA. * * SPDX-License-Identifier: LGPL-2.1+ Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2016-10-10 12:48:45 UTC (rev 9954) +++ trunk/passencrypt.php 2016-10-10 13:05:42 UTC (rev 9955) @@ -21,9 +21,9 @@ 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. - + SPDX-License-Identifier: GPL-2.0+ - + --> </head> <body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-10-13 13:15:49
|
Revision: 9963 http://sourceforge.net/p/phpwiki/code/9963 Author: vargenau Date: 2016-10-13 13:15:43 +0000 (Thu, 13 Oct 2016) Log Message: ----------- Prepare for PhpWiki 1.6.0 Modified Paths: -------------- trunk/INSTALL trunk/Makefile trunk/config/phpwiki.spec trunk/lib/prepend.php trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/pgsrc/%C3%84hnlicheSeiten trunk/locale/de/pgsrc/AlleBenutzer trunk/locale/de/pgsrc/AlleSeiten trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir trunk/locale/de/pgsrc/BackLinks trunk/locale/de/pgsrc/BenutzerEinstellungen trunk/locale/de/pgsrc/DebugAuthInfo trunk/locale/de/pgsrc/DebugBackendInfo trunk/locale/de/pgsrc/DebugGruppenInfo trunk/locale/de/pgsrc/EditiereText trunk/locale/de/pgsrc/Einstellungen trunk/locale/de/pgsrc/FuzzySuche trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/GaesteBuch trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen trunk/locale/de/pgsrc/GleicheSeiten trunk/locale/de/pgsrc/Hilfe trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin trunk/locale/de/pgsrc/Hilfe%2FGuterStil trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow trunk/locale/de/pgsrc/Hilfe%2FPhpWiki trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/locale/de/pgsrc/Hilfe%2FWabiSabi trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb trunk/locale/de/pgsrc/HochLaden trunk/locale/de/pgsrc/InterWikiListe trunk/locale/de/pgsrc/KategorieAktionSeite trunk/locale/de/pgsrc/KategorieKategorie trunk/locale/de/pgsrc/KategorieWikiPlugin trunk/locale/de/pgsrc/LinkSuche trunk/locale/de/pgsrc/ListeRelationen trunk/locale/de/pgsrc/ListeSeiten trunk/locale/de/pgsrc/MeistBesucht trunk/locale/de/pgsrc/ModerierteSeite trunk/locale/de/pgsrc/NeueSeite trunk/locale/de/pgsrc/Neueste%C3%84nderungen trunk/locale/de/pgsrc/NeuesteSeiten trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen trunk/locale/de/pgsrc/PhpWikiDokumentation trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen trunk/locale/de/pgsrc/PhpWikiUmfrage trunk/locale/de/pgsrc/SandKasten trunk/locale/de/pgsrc/SandKiste trunk/locale/de/pgsrc/SeiteBeobarten trunk/locale/de/pgsrc/SeiteFinden trunk/locale/de/pgsrc/SeiteSpeichern trunk/locale/de/pgsrc/SeitenErzeugen trunk/locale/de/pgsrc/SeitenInfo trunk/locale/de/pgsrc/SeitenProtokoll trunk/locale/de/pgsrc/SemantischeRelationen trunk/locale/de/pgsrc/SemantischeSuche trunk/locale/de/pgsrc/StartSeite trunk/locale/de/pgsrc/StartSeiteAlias trunk/locale/de/pgsrc/TitelSuche trunk/locale/de/pgsrc/UpLoad trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen trunk/locale/de/pgsrc/VerwaisteSeiten trunk/locale/de/pgsrc/VolltextSuche trunk/locale/de/pgsrc/Vorlage%2FBeispiel trunk/locale/de/pgsrc/WerIstOnline trunk/locale/de/pgsrc/WikiAdminAuswahl trunk/locale/de/pgsrc/WunschZettelSeiten trunk/locale/de/pgsrc/ZufallsSeite trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/es/pgsrc/Ayuda trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica trunk/locale/es/pgsrc/Ayuda%2FPhpWiki trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FWabiSabi trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb trunk/locale/es/pgsrc/BuscarP%C3%A1gina trunk/locale/es/pgsrc/CajaDeArena trunk/locale/es/pgsrc/CambiosRecientes trunk/locale/es/pgsrc/MasPopulares trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal trunk/locale/es/pgsrc/TodasLasPaginas trunk/locale/es/pgsrc/VisitantesRecientes trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FLienGoogle trunk/locale/fr/pgsrc/Aide%2FPhpWiki trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp trunk/locale/fr/pgsrc/Aide%2FPluginCommenter trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne trunk/locale/fr/pgsrc/Aide%2FPluginRedirection trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead trunk/locale/fr/pgsrc/Aide%2FStyleCorrect trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki trunk/locale/fr/pgsrc/Aide%2FWabiSabi 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%A9goriePagesAccueil 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/CommentairesR%C3%A9cents trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki 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/DocumentationDePhpWiki 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/NotesDeVersion trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesFloues trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/PierrickMeignen 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/SommaireDuProjet trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/Suivre trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/TraduireUnTexte trunk/locale/fr/pgsrc/VersionsR%C3%A9centes trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/it/pgsrc/Aiuto trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine trunk/locale/it/pgsrc/Aiuto%2FBuonStile trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto trunk/locale/it/pgsrc/Aiuto%2FPhpWiki trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento trunk/locale/it/pgsrc/Aiuto%2FWabiSabi trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi trunk/locale/it/pgsrc/CambiamentiRecenti trunk/locale/it/pgsrc/FuzzyPages trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/it/pgsrc/PaginaDiProva trunk/locale/it/pgsrc/PaginaPrincipale trunk/locale/it/pgsrc/PiuPopolari trunk/locale/it/pgsrc/RicercaDelTesto trunk/locale/it/pgsrc/RicercaSuTutto trunk/locale/it/pgsrc/ScatolaDiSabbia trunk/locale/it/pgsrc/SteveWainstead trunk/locale/it/pgsrc/TrovaPagina trunk/locale/it/pgsrc/TutteLePagine trunk/locale/it/pgsrc/VisitatoriRecenti trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8 trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/nl/pgsrc/Help trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren trunk/locale/nl/pgsrc/Help%2FGoedeStijl trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen trunk/locale/nl/pgsrc/Help%2FPhpWiki trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs trunk/locale/nl/pgsrc/Help%2FVeranderTekst trunk/locale/nl/pgsrc/Help%2FWabiSabi trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb trunk/locale/nl/pgsrc/MeestBezocht trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder trunk/locale/nl/pgsrc/RecenteVeranderingen trunk/locale/nl/pgsrc/ThuisPagina trunk/locale/nl/pgsrc/UitgaveNoten trunk/locale/nl/pgsrc/ZandBak trunk/locale/nl/pgsrc/ZoekPagina 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/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/MestPopul%C3%A4r trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida trunk/locale/sv/pgsrc/Sandl%C3%A5dan trunk/locale/sv/pgsrc/Senaste%C3%84ndringar trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81 trunk/locale/zh/pgsrc/AllPages trunk/locale/zh/pgsrc/AllUsers trunk/locale/zh/pgsrc/BackLinks trunk/locale/zh/pgsrc/DebugBackendInfo trunk/locale/zh/pgsrc/FindPage trunk/locale/zh/pgsrc/FullRecentChanges trunk/locale/zh/pgsrc/FullTextSearch trunk/locale/zh/pgsrc/FuzzyPages trunk/locale/zh/pgsrc/Help trunk/locale/zh/pgsrc/Help%2FAddingPages trunk/locale/zh/pgsrc/Help%2FCalendarPlugin trunk/locale/zh/pgsrc/Help%2FCommentPlugin trunk/locale/zh/pgsrc/Help%2FEditText trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin trunk/locale/zh/pgsrc/Help%2FHowToUseWiki trunk/locale/zh/pgsrc/Help%2FInterWiki trunk/locale/zh/pgsrc/Help%2FLinkIcons trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin trunk/locale/zh/pgsrc/Help%2FPhpWiki trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin trunk/locale/zh/pgsrc/Help%2FTranscludePlugin trunk/locale/zh/pgsrc/Help%2FWikiPlugin trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb trunk/locale/zh/pgsrc/HomePage trunk/locale/zh/pgsrc/HomePageAlias trunk/locale/zh/pgsrc/InterWikiMap trunk/locale/zh/pgsrc/InterWikiSearch trunk/locale/zh/pgsrc/LikePages trunk/locale/zh/pgsrc/OrphanedPages trunk/locale/zh/pgsrc/PageDump trunk/locale/zh/pgsrc/PhpWikiAdministration trunk/locale/zh/pgsrc/RandomPage trunk/locale/zh/pgsrc/RecentChanges trunk/locale/zh/pgsrc/RecentEdits trunk/locale/zh/pgsrc/RecentVisitors trunk/locale/zh/pgsrc/SandBox trunk/locale/zh/pgsrc/TitleSearch trunk/locale/zh/pgsrc/UpLoad trunk/locale/zh/pgsrc/UserPreferences trunk/locale/zh/pgsrc/WantedPages trunk/pgsrc/AllPages trunk/pgsrc/AllPagesByAcl trunk/pgsrc/AllPagesCreatedByMe trunk/pgsrc/AllPagesLastEditedByMe trunk/pgsrc/AllPagesOwnedByMe trunk/pgsrc/AllUserPages trunk/pgsrc/AllUsers trunk/pgsrc/AppendText trunk/pgsrc/AuthorHistory trunk/pgsrc/BackLinks trunk/pgsrc/BlogArchives trunk/pgsrc/BlogJournal trunk/pgsrc/CategoryActionPage trunk/pgsrc/CategoryCategory trunk/pgsrc/CategoryGroup trunk/pgsrc/CategoryHomePages trunk/pgsrc/CategoryWikiPlugin trunk/pgsrc/Copyrights trunk/pgsrc/CreatePage trunk/pgsrc/DebugAuthInfo trunk/pgsrc/DebugBackendInfo trunk/pgsrc/DebugGroupInfo trunk/pgsrc/EditMetaData trunk/pgsrc/FindPage trunk/pgsrc/FullRecentChanges trunk/pgsrc/FullTextSearch trunk/pgsrc/FuzzyPages trunk/pgsrc/GeneralDisclaimer trunk/pgsrc/Help trunk/pgsrc/Help%2FActionPage trunk/pgsrc/Help%2FAddCommentPlugin trunk/pgsrc/Help%2FAddingPages trunk/pgsrc/Help%2FAdobe%20Flash trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users trunk/pgsrc/Help%2FAllPagesPlugin trunk/pgsrc/Help%2FAllUsersPlugin trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin trunk/pgsrc/Help%2FAppendTextPlugin trunk/pgsrc/Help%2FAsciiMathPlugin trunk/pgsrc/Help%2FAsciiSVGPlugin trunk/pgsrc/Help%2FAtomFeedPlugin trunk/pgsrc/Help%2FAuthorHistoryPlugin trunk/pgsrc/Help%2FBackLinksPlugin trunk/pgsrc/Help%2FBlogArchivesPlugin trunk/pgsrc/Help%2FBlogJournalPlugin trunk/pgsrc/Help%2FBoxRightPlugin trunk/pgsrc/Help%2FCacheTestPlugin trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FCalendarPlugin trunk/pgsrc/Help%2FCategories trunk/pgsrc/Help%2FCategoryPagePlugin trunk/pgsrc/Help%2FChartPlugin trunk/pgsrc/Help%2FCommentPlugin trunk/pgsrc/Help%2FCreateBibPlugin trunk/pgsrc/Help%2FCreatePagePlugin trunk/pgsrc/Help%2FCreateTocPlugin trunk/pgsrc/Help%2FCurrentTimePlugin trunk/pgsrc/Help%2FDeadEndPagesPlugin trunk/pgsrc/Help%2FDebugAuthInfoPlugin trunk/pgsrc/Help%2FDebugBackendInfoPlugin trunk/pgsrc/Help%2FDebugGroupInfoPlugin trunk/pgsrc/Help%2FDebugRetransformPlugin trunk/pgsrc/Help%2FDiffPlugin trunk/pgsrc/Help%2FDynamicIncludePagePlugin trunk/pgsrc/Help%2FEditMetaDataPlugin trunk/pgsrc/Help%2FEditText trunk/pgsrc/Help%2FExternalSearchPlugin trunk/pgsrc/Help%2FFacebookLikePlugin trunk/pgsrc/Help%2FFileInfoPlugin trunk/pgsrc/Help%2FFoafViewerPlugin trunk/pgsrc/Help%2FFullTextSearchPlugin trunk/pgsrc/Help%2FFuzzyPagesPlugin trunk/pgsrc/Help%2FGoToPlugin trunk/pgsrc/Help%2FGoodStyle trunk/pgsrc/Help%2FGoogleLink trunk/pgsrc/Help%2FGoogleMapsPlugin trunk/pgsrc/Help%2FGooglePluginPlugin trunk/pgsrc/Help%2FGraphVizPlugin trunk/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FHowToUseWiki trunk/pgsrc/Help%2FHtmlConverterPlugin trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/Help%2FIncludePagesPlugin trunk/pgsrc/Help%2FIncludeSiteMapPlugin trunk/pgsrc/Help%2FIncludeTreePlugin trunk/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FInterWikiSearchPlugin trunk/pgsrc/Help%2FJabberPresencePlugin trunk/pgsrc/Help%2FJeff%20Dairiki trunk/pgsrc/Help%2FLdapSearchPlugin trunk/pgsrc/Help%2FLikePagesPlugin trunk/pgsrc/Help%2FLinkDatabasePlugin trunk/pgsrc/Help%2FLinkIcons trunk/pgsrc/Help%2FLinkSearchPlugin trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FListRelationsPlugin trunk/pgsrc/Help%2FListSubpagesPlugin trunk/pgsrc/Help%2FMagicPhpWikiURLs trunk/pgsrc/Help%2FMediawikiTablePlugin trunk/pgsrc/Help%2FModeratedPagePlugin trunk/pgsrc/Help%2FMoreAboutMechanics trunk/pgsrc/Help%2FMostPopularPlugin trunk/pgsrc/Help%2FNewPagesPerUserPlugin trunk/pgsrc/Help%2FNoCachePlugin trunk/pgsrc/Help%2FOldStyleTablePlugin trunk/pgsrc/Help%2FOrphanedPagesPlugin trunk/pgsrc/Help%2FPageDumpPlugin trunk/pgsrc/Help%2FPageGroupPlugin trunk/pgsrc/Help%2FPageHistoryPlugin trunk/pgsrc/Help%2FPageInfoPlugin trunk/pgsrc/Help%2FPageList trunk/pgsrc/Help%2FPagePermissions trunk/pgsrc/Help%2FPageTrailPlugin trunk/pgsrc/Help%2FPasswordResetPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides trunk/pgsrc/Help%2FPhpHighlightPlugin trunk/pgsrc/Help%2FPhpWeatherPlugin trunk/pgsrc/Help%2FPhpWiki trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/Help%2FPluginManagerPlugin trunk/pgsrc/Help%2FPopUpPlugin trunk/pgsrc/Help%2FPopularNearbyPlugin trunk/pgsrc/Help%2FPopularTagsPlugin trunk/pgsrc/Help%2FPredefinedIcons trunk/pgsrc/Help%2FPreferenceAppPlugin trunk/pgsrc/Help%2FPreferencesInfoPlugin trunk/pgsrc/Help%2FPrevNextPlugin trunk/pgsrc/Help%2FProcessingPlugin trunk/pgsrc/Help%2FRandomPagePlugin trunk/pgsrc/Help%2FRateItPlugin trunk/pgsrc/Help%2FRawHtmlPlugin trunk/pgsrc/Help%2FRecentChangesCachedPlugin trunk/pgsrc/Help%2FRecentChangesPlugin trunk/pgsrc/Help%2FRecentCommentsPlugin trunk/pgsrc/Help%2FRecentEditsPlugin trunk/pgsrc/Help%2FRecentReferrersPlugin trunk/pgsrc/Help%2FRedirectToPlugin trunk/pgsrc/Help%2FReini%20Urban trunk/pgsrc/Help%2FRelatedChangesPlugin trunk/pgsrc/Help%2FRichTablePlugin trunk/pgsrc/Help%2FRssFeedPlugin trunk/pgsrc/Help%2FSearchHighlightPlugin trunk/pgsrc/Help%2FSemanticRelations trunk/pgsrc/Help%2FSemanticRelationsPlugin trunk/pgsrc/Help%2FSemanticSearchAdvancedPlugin trunk/pgsrc/Help%2FSemanticSearchPlugin trunk/pgsrc/Help%2FSiteMapPlugin trunk/pgsrc/Help%2FSpellCheckPlugin trunk/pgsrc/Help%2FSpreadsheet trunk/pgsrc/Help%2FSqlResultPlugin trunk/pgsrc/Help%2FSteve%20Wainstead trunk/pgsrc/Help%2FSyncWikiPlugin trunk/pgsrc/Help%2FSyntaxHighlighterPlugin trunk/pgsrc/Help%2FSystemInfoPlugin trunk/pgsrc/Help%2FTeX2pngPlugin trunk/pgsrc/Help%2FTemplatePlugin trunk/pgsrc/Help%2FTexToPngPlugin trunk/pgsrc/Help%2FTextFormattingRules trunk/pgsrc/Help%2FTitleSearchPlugin trunk/pgsrc/Help%2FTranscludePlugin trunk/pgsrc/Help%2FTranslateTextPlugin trunk/pgsrc/Help%2FUnfoldSubpagesPlugin trunk/pgsrc/Help%2FUpLoadPlugin trunk/pgsrc/Help%2FUriResolverPlugin trunk/pgsrc/Help%2FUserPreferencesPlugin trunk/pgsrc/Help%2FUserRatingsPlugin trunk/pgsrc/Help%2FVideoPlugin trunk/pgsrc/Help%2FVisualWikiPlugin trunk/pgsrc/Help%2FWabiSabi trunk/pgsrc/Help%2FWantedPagesPlugin trunk/pgsrc/Help%2FWatchPagePlugin trunk/pgsrc/Help%2FWhoIsOnlinePlugin trunk/pgsrc/Help%2FWikiAdminChownPlugin trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin trunk/pgsrc/Help%2FWikiAdminPurgePlugin trunk/pgsrc/Help%2FWikiAdminRemovePlugin trunk/pgsrc/Help%2FWikiAdminRenamePlugin trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin trunk/pgsrc/Help%2FWikiAdminSelectPlugin trunk/pgsrc/Help%2FWikiAdminSetAclPlugin trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin trunk/pgsrc/Help%2FWikiAdminUtilsPlugin trunk/pgsrc/Help%2FWikiBlogPlugin trunk/pgsrc/Help%2FWikiFormPlugin trunk/pgsrc/Help%2FWikiFormRichPlugin trunk/pgsrc/Help%2FWikiForumPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/Help%2FWikiPollPlugin trunk/pgsrc/Help%2FWikiTranslationPlugin trunk/pgsrc/Help%2FWikiWikiWeb trunk/pgsrc/Help%2FWikicreole trunk/pgsrc/Help%2FWikicreoleTablePlugin trunk/pgsrc/Help%2FWikisUsingPhpWiki trunk/pgsrc/Help%2FYouTubePlugin trunk/pgsrc/Help%2Ftext2pngPlugin trunk/pgsrc/HomePage trunk/pgsrc/HomePageAlias trunk/pgsrc/InterWikiMap trunk/pgsrc/InterWikiSearch trunk/pgsrc/LdapSearch trunk/pgsrc/LeastPopular trunk/pgsrc/LikePages trunk/pgsrc/LinkDatabase trunk/pgsrc/LinkSearch trunk/pgsrc/ListRelations trunk/pgsrc/LockedPages trunk/pgsrc/ModeratedPage trunk/pgsrc/MostPopular trunk/pgsrc/MyRatings trunk/pgsrc/MyRecentChanges trunk/pgsrc/MyRecentEdits trunk/pgsrc/NewPagesPerUser trunk/pgsrc/OrphanedPages trunk/pgsrc/PageDump trunk/pgsrc/PageHistory trunk/pgsrc/PageInfo trunk/pgsrc/PasswordReset trunk/pgsrc/PhpWikiAdministration trunk/pgsrc/PhpWikiAdministration%2FChown trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl trunk/pgsrc/PhpWikiAdministration%2FPurge trunk/pgsrc/PhpWikiAdministration%2FRemove trunk/pgsrc/PhpWikiAdministration%2FRename trunk/pgsrc/PhpWikiAdministration%2FSearchReplace trunk/pgsrc/PhpWikiAdministration%2FSetAcl trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/pgsrc/PhpWikiDebug trunk/pgsrc/PhpWikiDocumentation trunk/pgsrc/PhpWikiManual trunk/pgsrc/PhpWikiPoll trunk/pgsrc/PhpWikiRecentChanges trunk/pgsrc/PluginManager trunk/pgsrc/ProjectSummary trunk/pgsrc/RandomPage trunk/pgsrc/RateIt trunk/pgsrc/RecentChanges trunk/pgsrc/RecentChangesMyPages trunk/pgsrc/RecentComments trunk/pgsrc/RecentEdits trunk/pgsrc/RecentNewPages trunk/pgsrc/RecentReleases trunk/pgsrc/RecentVisitors trunk/pgsrc/RelatedChanges trunk/pgsrc/ReleaseNotes trunk/pgsrc/San%20Diego trunk/pgsrc/SandBox trunk/pgsrc/SearchHighlight trunk/pgsrc/SemanticRelations trunk/pgsrc/SemanticSearch trunk/pgsrc/SetGlobalAccessRights trunk/pgsrc/SetGlobalAccessRightsSimple trunk/pgsrc/SpecialPages trunk/pgsrc/SpellCheck trunk/pgsrc/SystemInfo trunk/pgsrc/Template%2FAttribute trunk/pgsrc/Template%2FCategory trunk/pgsrc/Template%2FExample trunk/pgsrc/Template%2FLinkto trunk/pgsrc/Template%2FNewPlugin trunk/pgsrc/Template%2FRelation trunk/pgsrc/Template%2FTalk trunk/pgsrc/Template%2FUserPage trunk/pgsrc/The%20PhpWiki%20programming%20team trunk/pgsrc/TitleSearch trunk/pgsrc/TranslateText trunk/pgsrc/UpLoad trunk/pgsrc/UriResolver trunk/pgsrc/UserContribs trunk/pgsrc/UserPreferences trunk/pgsrc/UserRatings trunk/pgsrc/WantedPages trunk/pgsrc/WatchPage trunk/pgsrc/WhoIsOnline trunk/pgsrc/WikiAdminSelect trunk/pgsrc/WikiBlog trunk/pgsrc/area trunk/pgsrc/is_a trunk/pgsrc/located_in trunk/pgsrc/population trunk/themes/blog/pgsrc/About trunk/themes/blog/pgsrc/Blog trunk/themes/blog/pgsrc/CategoryHowTo trunk/themes/blog/pgsrc/HomePage trunk/themes/blog/pgsrc/HowTo trunk/themes/blog/pgsrc/PhotoAlbum trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates trunk/themes/fusionforge/pgsrc/CategoryWiki%20user trunk/themes/fusionforge/pgsrc/ExternalPages trunk/themes/fusionforge/pgsrc/FindPage trunk/themes/fusionforge/pgsrc/FullTextSearch trunk/themes/fusionforge/pgsrc/HomePage trunk/themes/fusionforge/pgsrc/PhpWikiAdministration trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple trunk/themes/fusionforge/pgsrc/SpecialPages trunk/themes/fusionforge/pgsrc/TextFormattingRules trunk/themes/fusionforge/pgsrc/TitleSearch trunk/themes/fusionforge/pgsrc/UpLoad trunk/themes/fusionforge/pgsrc/colorbox trunk/themes/fusionforge/pgsrc/titlebar trunk/themes/wikilens/pgsrc/LeftbarContent Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/INSTALL 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,12 +1,11 @@ REQUIREMENTS -PhpWiki 1.5.5 requires a web server with at least PHP version 5.3. +PhpWiki 1.6.0 requires a web server with at least PHP version 5.3. +PhpWiki 1.6.0 is compatible with the PHP 7.0 series. -All users of PHP are strongly encouraged to upgrade to -PHP 5.3.29, PHP 5.4.45, PHP 5.5 or PHP 5.6. +All users of PHP are strongly encouraged to upgrade to PHP 5.6 +or PHP 7.0. -PhpWiki 1.5.5 is not yet compatible with the PHP 7 series. - Visit <http://www.php.net> and <http://php.net/downloads.php> for downloads and information. @@ -59,7 +58,7 @@ Unzip this file into the directory where you want it to live. That's it. -bash$ unzip phpwiki-1.5.5.zip +bash$ unzip phpwiki-1.6.0.zip In the config subdirectory copy 'config-dist.ini' to 'config.ini' and edit the settings in 'config.ini' to your liking. Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/Makefile 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,4 +1,4 @@ -VERSION=1.5.5 +VERSION=1.6.0 RPMBUILD=rpmbuild clean: Modified: trunk/config/phpwiki.spec =================================================================== --- trunk/config/phpwiki.spec 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/config/phpwiki.spec 2016-10-13 13:15:43 UTC (rev 9963) @@ -40,7 +40,7 @@ # RPM spec preamble Summary: PHP-based Wiki webapplication Name: phpwiki -Version: 1.5.5 +Version: 1.6.0 Release: 1 BuildArch: noarch License: GPL Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/lib/prepend.php 2016-10-13 13:15:43 UTC (rev 9963) @@ -30,7 +30,7 @@ */ // see lib/stdlib.php: phpwiki_version() -define('PHPWIKI_VERSION', '1.5.5'); +define('PHPWIKI_VERSION', '1.6.0'); // A new php-5.1.x feature: Turn off php-5.1.x auto_globals_jit = On, or use this mess below. if (empty($GLOBALS['HTTP_SERVER_VARS'])) { Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/Makefile 2016-10-13 13:15:43 UTC (rev 9963) @@ -817,4 +817,3 @@ ${POT_FILE}: .././themes/Wordpress/templates/viewsource.tmpl ${POT_FILE}: .././themes/Wordpress/themeinfo.php ${POT_FILE}: .././uploads/index.php -${POT_FILE}: .././view.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten =================================================================== --- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=%C3%84hnlicheSeiten; flags=""; Modified: trunk/locale/de/pgsrc/AlleBenutzer =================================================================== --- trunk/locale/de/pgsrc/AlleBenutzer 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/AlleBenutzer 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=AlleBenutzer; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeiten =================================================================== --- trunk/locale/de/pgsrc/AlleSeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/AlleSeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=AlleSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenEditiertVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenErzeugtVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenImBesitzVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BackLinks =================================================================== --- trunk/locale/de/pgsrc/BackLinks 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/BackLinks 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=BackLinks; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen =================================================================== --- trunk/locale/de/pgsrc/BenutzerEinstellungen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=BenutzerEinstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/DebugAuthInfo =================================================================== --- trunk/locale/de/pgsrc/DebugAuthInfo 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/DebugAuthInfo 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/DebugBackendInfo =================================================================== --- trunk/locale/de/pgsrc/DebugBackendInfo 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/DebugBackendInfo 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Wed, 27 Jul 2016 16:49:22 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=DebugBackendInfo; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/DebugGruppenInfo =================================================================== --- trunk/locale/de/pgsrc/DebugGruppenInfo 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/DebugGruppenInfo 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=DebugGruppenInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/EditiereText =================================================================== --- trunk/locale/de/pgsrc/EditiereText 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/EditiereText 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=EditiereText; flags=""; Modified: trunk/locale/de/pgsrc/Einstellungen =================================================================== --- trunk/locale/de/pgsrc/Einstellungen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Einstellungen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Einstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/FuzzySuche =================================================================== --- trunk/locale/de/pgsrc/FuzzySuche 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/FuzzySuche 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=FuzzySuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; flags=""; Modified: trunk/locale/de/pgsrc/GaesteBuch =================================================================== --- trunk/locale/de/pgsrc/GaesteBuch 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/GaesteBuch 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=GaesteBuch; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Geringf%C3%BCgige%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/GleicheSeiten =================================================================== --- trunk/locale/de/pgsrc/GleicheSeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/GleicheSeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=GleicheSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe =================================================================== --- trunk/locale/de/pgsrc/Hilfe 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAktionsSeite; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAutorenProtokollPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGraphVizPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGuterStil; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHalloWeltPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FInhaltsVerzeichnisPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeueSeitePlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeuerKommentarPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhpWiki; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextBearbeiten; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextFormatierungsRegeln; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FVorlagePlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWabiSabi; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWieManWikiBenutzt; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiTechnik; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiWikiWeb; flags=""; Modified: trunk/locale/de/pgsrc/HochLaden =================================================================== --- trunk/locale/de/pgsrc/HochLaden 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/HochLaden 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=HochLaden; flags=""; Modified: trunk/locale/de/pgsrc/InterWikiListe =================================================================== --- trunk/locale/de/pgsrc/InterWikiListe 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/InterWikiListe 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=InterWikiListe; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieAktionSeite =================================================================== --- trunk/locale/de/pgsrc/KategorieAktionSeite 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/KategorieAktionSeite 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=KategorieAktionSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieKategorie =================================================================== --- trunk/locale/de/pgsrc/KategorieKategorie 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/KategorieKategorie 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=KategorieKategorie; flags=""; Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin =================================================================== --- trunk/locale/de/pgsrc/KategorieWikiPlugin 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=KategorieWikiPlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/LinkSuche =================================================================== --- trunk/locale/de/pgsrc/LinkSuche 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/LinkSuche 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=LinkSuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeRelationen =================================================================== --- trunk/locale/de/pgsrc/ListeRelationen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/ListeRelationen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ListeRelationen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeSeiten =================================================================== --- trunk/locale/de/pgsrc/ListeSeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/ListeSeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ListeSeiten; flags=""; Modified: trunk/locale/de/pgsrc/MeistBesucht =================================================================== --- trunk/locale/de/pgsrc/MeistBesucht 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/MeistBesucht 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=MeistBesucht; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/ModerierteSeite 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ModerierteSeite; flags="LOCKED"; Modified: trunk/locale/de/pgsrc/NeueSeite =================================================================== --- trunk/locale/de/pgsrc/NeueSeite 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/NeueSeite 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NeueSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Neueste%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/NeuesteSeiten =================================================================== --- trunk/locale/de/pgsrc/NeuesteSeiten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/NeuesteSeiten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NeuesteSeiten; flags=""; Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen =================================================================== --- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=PasswortZur%C3%BCcksetzen; flags=""; Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation =================================================================== --- trunk/locale/de/pgsrc/PhpWikiDokumentation 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=PhpWikiDokumentation; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2016-10-13 12:56:38 UTC (rev 9962) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2016-10-13 13:15:43 UTC (rev 9963) @@ -1,5 +1,5 @@ -Date: Thu, 10 Dec 2015 18:48:02 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.5) +Date: Thu, 13 Oct 2016 15:09:23 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FAclSetzen; flags=PAGE_LOCKED; Modifie... [truncated message content] |
From: <var...@us...> - 2016-10-14 11:00:16
|
Revision: 9970 http://sourceforge.net/p/phpwiki/code/9970 Author: vargenau Date: 2016-10-14 11:00:13 +0000 (Fri, 14 Oct 2016) Log Message: ----------- Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com) Modified Paths: -------------- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php =================================================================== --- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2016-10-14 10:41:55 UTC (rev 9969) +++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2016-10-14 11:00:13 UTC (rev 9970) @@ -2,215 +2,213 @@ $symbol_arr = array( -// Greek symbols -'alpha' => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'), -'beta' => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'), -'chi' => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'), -'delta' => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'), -'Delta' => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'), -'epsi' => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'), -'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'), -'eta' => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'), -'gamma' => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'), -'Gamma' => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'), -'iota' => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'), -'kappa' => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'), -'lambda' => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'), -'Lambda' => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'), -'mu' => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'), -'nu' => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'), -'omega' => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'), -'Omega' => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'), -'phi' => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'), -'varphi' => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'), -'Phi' => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'), -'pi' => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'), -'Pi' => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'), -'psi' => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'), -'rho' => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'), -'sigma' => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'), -'Sigma' => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'), -'tau' => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'), -'theta' => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'), -'vartheta' => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'), -'Theta' => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'), -'upsilon' => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'), -'xi' => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'), -'Xi' => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'), -'zeta' => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'), - -// Binary operation symbols -'*' => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'), -'**' => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'), -'//' => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'), -'\\\\' => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'), -'xx' => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'), -'-:' => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'), -'@' => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'), -'o+' => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'), -'ox' => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'), -'sum' => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE), -'prod' => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE), -'^^' => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'), -'^^^' => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE), -'vv' => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'), -'vvv' => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE), -'nn' => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'), -'nnn' => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE), -'uu' => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'), -'uuu' => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE), - -// Binary relation symbols -'!=' => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'), -':=' => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), /* 2005-06-05 wes */ -'<' => array( 'input'=>'<','tag'=>'mo', 'output'=>'<'), -'lt' => array( 'input'=>'lt','tag'=>'mo', 'output'=>'<'), /* 2005-06-05 wes */ -'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), -'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), -'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */ -'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'), -'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'), -'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'), -'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'), -'-lt' => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'), -'>-' => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'), -'in' => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'), -'!in' => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'), -'sub' => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'), -'sup' => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'), -'sube' => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'), -'supe' => array( 'input'=>'supe','tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'), -'-=' => array( 'input'=>'-=','tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'), -'~=' => array( 'input'=>'~=','tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'), -'~~' => array( 'input'=>'~~','tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'), -'prop' => array( 'input'=>'prop','tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'), - -// Logical symbols -'and' => array( 'input'=>'and','tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'), -'or' => array( 'input'=>'or','tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'), -'not' => array( 'input'=>'not','tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'), -'=>' => array( 'input'=>'=>','tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'), -'if' => array( 'input'=>'if','tag'=>'mo', 'output'=>'if', 'space'=>'1ex'), -'iff' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), -'<=>' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), /* 2005-06-07 wes */ -'AA' => array( 'input'=>'AA','tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'), -'EE' => array( 'input'=>'EE','tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'), -'_|_' => array( 'input'=>'_|_','tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'), -'TT' => array( 'input'=>'TT','tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'), -'|-' => array( 'input'=>'|-','tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'), -'|=' => array( 'input'=>'|=','tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'), - -// Miscellaneous symbols -'ang' => array('input'=>'ang','tag'=>'mo','output'=>'&#' . hexdec('2220') . ';'), -'deg' => array('input'=>'deg','tag'=>'mo','output'=>'&#' . hexdec('00B0') . ';'), -'int' => array( 'input'=>'int','tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'), -'dx' => array( 'input'=>'dx','tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), /* 2005-06-11 wes */ -'dy' => array( 'input'=>'dy','tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), /* 2005-06-11 wes */ -'dz' => array( 'input'=>'dz','tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), /* 2005-06-11 wes */ -'dt' => array( 'input'=>'dt','tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), /* 2005-06-11 wes */ -'oint' => array( 'input'=>'oint','tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'), -'del' => array( 'input'=>'del','tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'), -'grad' => array( 'input'=>'grad','tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'), -'+-' => array( 'input'=>'+-','tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'), -'O/' => array( 'input'=>'0/','tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'), -'oo' => array( 'input'=>'oo','tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'), -'aleph' => array( 'input'=>'aleph','tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'), -'...' => array( 'input'=>'int','tag'=>'mo', 'output'=>'...'), -'~' => array( 'input'=>'!~','tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'), -'\\ ' => array( 'input'=>'~','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'), -'quad' => array( 'input'=>'quad','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'), -'qquad' => array( 'input'=>'qquad','tag'=>'mo', 'output'=> '&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'), -'cdots' => array( 'input'=>'cdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'), -'vdots' => array( 'input'=>'vdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), /* 2005-06-11 wes */ -'ddots' => array( 'input'=>'ddots','tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), /* 2005-06-11 wes */ -'diamond' => array( 'input'=>'diamond','tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'), -'square' => array( 'input'=>'square','tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'), -'|_' => array( 'input'=>'|_','tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'), -'_|' => array( 'input'=>'_|','tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'), -'|~' => array( 'input'=>'|~','tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'), -'~|' => array( 'input'=>'~|','tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'), -'CC' => array( 'input'=>'CC','tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'), -'NN' => array( 'input'=>'NN','tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'), -'QQ' => array( 'input'=>'QQ','tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'), -'RR' => array( 'input'=>'RR','tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'), -'ZZ' => array( 'input'=>'ZZ','tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'), - -// Standard functions -'lim' => array( 'input'=>'lim','tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE), -'Lim' => array( 'input'=>'Lim','tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), /* 2005-06-11 wes */ -'sin' => array( 'input'=>'sin','tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE), -'cos' => array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE), -'tan' => array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE), -'arcsin' => array( 'input'=>'arcsin','tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL -'arccos' => array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL -'arctan' => array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL -'sinh' => array( 'input'=>'sinh','tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE), -'cosh' => array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE), -'tanh' => array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE), -'cot' => array( 'input'=>'cot','tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE), -'sec' => array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE), -'csc' => array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE), -'coth' => array( 'input'=>'coth','tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE), -'sech' => array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE), -'csch' => array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE), -'log' => array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE), -'ln' => array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE), -'det' => array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE), -'dim' => array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'), -'mod' => array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'), -'gcd' => array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE), -'lcm' => array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE), -'lub' => array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), /* 2005-06-11 wes */ -'glb' => array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), /* 2005-06-11 wes */ -'min' => array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), /* 2005-06-11 wes */ -'max' => array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), /* 2005-06-11 wes */ -'f' => array( 'input'=>'f','tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL -'g' => array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL - -// Arrows -'uarr' => array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'), -'darr' => array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'), -'rarr' => array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'), -'->' => array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'), -'|->' => array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), /* 2005-06-11 wes */ -'larr' => array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'), -'harr' => array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'), -'rArr' => array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'), -'lArr' => array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'), -'hArr' => array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), - -// Commands with argument -'sqrt' => array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE ), -'root' => array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE ), -'frac' => array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE), -'/' => array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE), -'_' => array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE), -'^' => array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE), -'hat' => array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE), -'bar' => array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE), -'vec' => array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE), -'dot' => array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE), -'ddot' => array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE), -'ul' => array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE), -'avec' => array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE), -'text' => array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE), -'mbox' => array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE), -'"' => array( 'input'=>'"', 'tag'=>'mtext','output'=>'mbox', 'unary'=>TRUE), - -/* 2005-06-05 wes: added stackrel */ -'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE), - -// Grouping brackets -'(' => array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE), -')' => array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE), -'[' => array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE), -']' => array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE), -'{' => array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE), -'}' => array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE), -'(:' => array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), -':)' => array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE), -'{:' => array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE), -':}' => array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE), -'<<' => array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes -'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes -); + // Greek symbols + 'alpha' => array( 'input'=>'alpha', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'), + 'beta' => array( 'input'=>'beta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'), + 'chi' => array( 'input'=>'chi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'), + 'delta' => array( 'input'=>'delta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'), + 'Delta' => array( 'input'=>'Delta', 'tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'), + 'epsi' => array( 'input'=>'epsi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'), + 'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'), + 'eta' => array( 'input'=>'eta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'), + 'gamma' => array( 'input'=>'gamma', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'), + 'Gamma' => array( 'input'=>'Gamma', 'tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'), + 'iota' => array( 'input'=>'iota', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'), + 'kappa' => array( 'input'=>'kappa', 'tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'), + 'lambda' => array( 'input'=>'lambda', 'tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'), + 'Lambda' => array( 'input'=>'Lambda', 'tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'), + 'mu' => array( 'input'=>'mu', 'tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'), + 'nu' => array( 'input'=>'nu', 'tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'), + 'omega' => array( 'input'=>'omega', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'), + 'Omega' => array( 'input'=>'Omega', 'tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'), + 'phi' => array( 'input'=>'phi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'), + 'varphi' => array( 'input'=>'varphi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'), + 'Phi' => array( 'input'=>'Phi', 'tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'), + 'pi' => array( 'input'=>'pi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'), + 'Pi' => array( 'input'=>'Pi', 'tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'), + 'psi' => array( 'input'=>'psi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'), + 'rho' => array( 'input'=>'rho', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'), + 'sigma' => array( 'input'=>'sigma', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'), + 'Sigma' => array( 'input'=>'Sigma', 'tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'), + 'tau' => array( 'input'=>'tau', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'), + 'theta' => array( 'input'=>'theta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'), + 'vartheta' => array( 'input'=>'vartheta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'), + 'Theta' => array( 'input'=>'Theta', 'tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'), + 'upsilon' => array( 'input'=>'upsilon', 'tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'), + 'xi' => array( 'input'=>'xi', 'tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'), + 'Xi' => array( 'input'=>'alpha', 'tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'), + 'zeta' => array( 'input'=>'zeta', 'tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'), + + // Binary operation symbols + '*' => array( 'input'=>'*', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'), + '**' => array( 'input'=>'**', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'), + '//' => array( 'input'=>'//', 'tag'=>'mo', 'output'=>'/'), + '\\\\' => array( 'input'=>'\\\\', 'tag'=>'mo', 'output'=>'\\'), + 'xx' => array( 'input'=>'xx', 'tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'), + '-:' => array( 'input'=>'-:', 'tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'), + '@' => array( 'input'=>'@', 'tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'), + 'o+' => array( 'input'=>'o+', 'tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'), + 'ox' => array( 'input'=>'ox', 'tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'), + 'sum' => array( 'input'=>'sum', 'tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE), + 'prod' => array( 'input'=>'prod', 'tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE), + '^^' => array( 'input'=>'^^', 'tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'), + '^^^' => array( 'input'=>'^^^', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE), + 'vv' => array( 'input'=>'vv', 'tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'), + 'vvv' => array( 'input'=>'vvv', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE), + 'nn' => array( 'input'=>'nn', 'tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'), + 'nnn' => array( 'input'=>'nnn', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE), + 'uu' => array( 'input'=>'uu', 'tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'), + 'uuu' => array( 'input'=>'uuu', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE), + + // Binary relation symbols + '!=' => array( 'input'=>'!=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'), + ':=' => array( 'input'=>':=', 'tag'=>'mo', 'output'=>':=' ), // 2005-06-05 wes + '<' => array( 'input'=>'<', 'tag'=>'mo', 'output'=>'<'), + 'lt' => array( 'input'=>'lt', 'tag'=>'mo', 'output'=>'<'), // 2005-06-05 wes + '<=' => array( 'input'=>'<=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), + 'lt=' => array( 'input'=>'lt=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), + 'le' => array( 'input'=>'le', 'tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), // 2005-06-05 wes + '>' => array( 'input'=>'>', 'tag'=>'mo', 'output'=>'>'), + '>=' => array( 'input'=>'>=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'), + 'qeq' => array( 'input'=>'geq', 'tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'), + '-<' => array( 'input'=>'-<', 'tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'), + '-lt' => array( 'input'=>'-lt', 'tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'), + '>-' => array( 'input'=>'>-', 'tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'), + 'in' => array( 'input'=>'in', 'tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'), + '!in' => array( 'input'=>'!in', 'tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'), + 'sub' => array( 'input'=>'sub', 'tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'), + 'sup' => array( 'input'=>'sup', 'tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'), + 'sube' => array( 'input'=>'sube', 'tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'), + 'supe' => array( 'input'=>'supe', 'tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'), + '-=' => array( 'input'=>'-=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'), + '~=' => array( 'input'=>'~=', 'tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'), + '~~' => array( 'input'=>'~~', 'tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'), + 'prop' => array( 'input'=>'prop', 'tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'), + + // Logical symbols + 'and' => array( 'input'=>'and', 'tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'), + 'or' => array( 'input'=>'or', 'tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'), + 'not' => array( 'input'=>'not', 'tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'), + '=>' => array( 'input'=>'=>', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'), + 'if' => array( 'input'=>'if', 'tag'=>'mo', 'output'=>'if', 'space'=>'1ex'), + 'iff' => array( 'input'=>'iff', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), + '<=>' => array( 'input'=>'iff', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), // 2005-06-07 wes + 'AA' => array( 'input'=>'AA', 'tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'), + 'EE' => array( 'input'=>'EE', 'tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'), + '_|_' => array( 'input'=>'_|_', 'tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'), + 'TT' => array( 'input'=>'TT', 'tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'), + '|-' => array( 'input'=>'|-', 'tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'), + '|=' => array( 'input'=>'|=', 'tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'), + + // Miscellaneous symbols + 'ang' => array( 'input'=>'ang', 'tag'=>'mo', 'output'=>'&#' . hexdec('2220') . ';'), + 'deg' => array( 'input'=>'deg', 'tag'=>'mo', 'output'=>'&#' . hexdec('00B0') . ';'), + 'int' => array( 'input'=>'int', 'tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'), + 'dx' => array( 'input'=>'dx', 'tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), // 2005-06-11 wes + 'dy' => array( 'input'=>'dy', 'tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), // 2005-06-11 wes + 'dz' => array( 'input'=>'dz', 'tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), // 2005-06-11 wes + 'dt' => array( 'input'=>'dt', 'tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), // 2005-06-11 wes + 'oint' => array( 'input'=>'oint', 'tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'), + 'del' => array( 'input'=>'del', 'tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'), + 'grad' => array( 'input'=>'grad', 'tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'), + '+-' => array( 'input'=>'+-', 'tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'), + 'O/' => array( 'input'=>'0/', 'tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'), + 'oo' => array( 'input'=>'oo', 'tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'), + 'aleph' => array( 'input'=>'aleph', 'tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'), + '...' => array( 'input'=>'int', 'tag'=>'mo', 'output'=>'...'), + '~' => array( 'input'=>'!~', 'tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'), + '\\ ' => array( 'input'=>'~', 'tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'), + 'quad' => array( 'input'=>'quad', 'tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'), + 'qquad' => array( 'input'=>'qquad', 'tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'), + 'cdots' => array( 'input'=>'cdots', 'tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'), + 'vdots' => array( 'input'=>'vdots', 'tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), // 2005-06-11 wes + 'ddots' => array( 'input'=>'ddots', 'tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), // 2005-06-11 wes + 'diamond' => array( 'input'=>'diamond', 'tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'), + 'square' => array( 'input'=>'square', 'tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'), + '|_' => array( 'input'=>'|_', 'tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'), + '_|' => array( 'input'=>'_|', 'tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'), + '|~' => array( 'input'=>'|~', 'tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'), + '~|' => array( 'input'=>'~|', 'tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'), + 'CC' => array( 'input'=>'CC', 'tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'), + 'NN' => array( 'input'=>'NN', 'tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'), + 'QQ' => array( 'input'=>'QQ', 'tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'), + 'RR' => array( 'input'=>'RR', 'tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'), + 'ZZ' => array( 'input'=>'ZZ', 'tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'), + + // Standard functions + 'lim' => array( 'input'=>'lim', 'tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE), + 'Lim' => array( 'input'=>'Lim', 'tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), // 2005-06-11 wes + 'sin' => array( 'input'=>'sin', 'tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE), + 'cos' => array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE), + 'tan' => array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE), + 'arcsin' => array( 'input'=>'arcsin', 'tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), // 2006-09-07 DL + 'arccos' => array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), // 2006-09-07 DL + 'arctan' => array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), // 2006-09-07 DL + 'sinh' => array( 'input'=>'sinh', 'tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE), + 'cosh' => array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE), + 'tanh' => array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE), + 'cot' => array( 'input'=>'cot', 'tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE), + 'sec' => array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE), + 'csc' => array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE), + 'coth' => array( 'input'=>'coth', 'tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE), + 'sech' => array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE), + 'csch' => array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE), + 'log' => array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE), + 'ln' => array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE), + 'det' => array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE), + 'dim' => array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'), + 'mod' => array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'), + 'gcd' => array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE), + 'lcm' => array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE), + 'lub' => array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), // 2005-06-11 wes + 'glb' => array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), // 2005-06-11 wes + 'min' => array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), // 2005-06-11 wes + 'max' => array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), // 2005-06-11 wes + 'f' => array( 'input'=>'f', 'tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), // 2006-09-07 DL + 'g' => array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), // 2006-09-07 DL + + // Arrows + 'uarr' => array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'), + 'darr' => array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'), + 'rarr' => array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'), + '->' => array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'), + '|->' => array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), // 2005-06-11 wes + 'larr' => array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'), + 'harr' => array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'), + 'rArr' => array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'), + 'lArr' => array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'), + 'hArr' => array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), + + // Commands with argument + 'sqrt' => array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE), + 'root' => array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE), + 'frac' => array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE), + 'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE), // 2005-06-05 wes + '/' => array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE), + '_' => array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE), + '^' => array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE), + 'hat' => array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE), + 'bar' => array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE), + 'vec' => array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE), + 'dot' => array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE), + 'ddot' => array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE), + 'ul' => array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE), + 'avec' => array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE), + 'text' => array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE), + 'mbox' => array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE), + '"' => array( 'input'=>'"', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE), + + // Grouping brackets + '(' => array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE), + ')' => array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE), + '[' => array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE), + ']' => array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE), + '{' => array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE), + '}' => array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE), + '(:' => array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), + ':)' => array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE), + '{:' => array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE), + ':}' => array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE), + '<<' => array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes + '>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes +); \ No newline at end of file Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php =================================================================== --- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2016-10-14 10:41:55 UTC (rev 9969) +++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2016-10-14 11:00:13 UTC (rev 9970) @@ -5,11 +5,13 @@ * -- XMLNode * -- MathMLNode extends XMLNode * + * ASCIIMathPHP Version 2.1, 30 December 2013, (c) Zefling (http://ikilote.net / ze...@ik...) + * * These classes are a PHP port of ASCIIMath * Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen * * ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...) - * + * * This program 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 @@ -23,6 +25,10 @@ * * ChangeLog * + * Ver 2.1 + * -- correct PHP5 object version of ASCIIMathPHP, MathMLNode, XMLNode + * -- fixed bug of empty list in XMLNode (dumpXML & _dumpAttr) + * * Ver 2.0 * -- PHP5 only version of ASCIIMathPHP * @@ -31,10 +37,10 @@ * * Ver 1.12 * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to - * ASCIIMath 1.4.7 functionality. + * ASCIIMath 1.4.7 public functionality. * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3) * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello) - * -- Added FUNC designator to allow sin, cos, etc to act as functions, so sin(x)/x renders as {sin(x)}/x + * -- Added FUNC designator to allow sin, cos, etc to act as public functions, so sin(x)/x renders as {sin(x)}/x * * Ver 1.11 * -- Fixed bug that stopped script execution for incomplete expressions @@ -57,1062 +63,1073 @@ class XMLNode { - // Private variables - var $_id; - var $_name; - var $_content; - var $_mt_elem_flg; - var $_attr_arr; - var $_child_arr; - var $_nmspc; - var $_nmspc_alias; - var $_parent_id; - var $_parent_node; + // Private variables + protected $_id; + protected $_name; + protected $_content; + protected $_mt_elem_flg; + protected $_attr_arr; + protected $_child_arr; + protected $_nmspc; + protected $_nmspc_alias; + protected $_parent_id; + protected $_parent_node; - function XMLNode($id = NULL) - { - $this->_id = isset($id) ? $id : md5(uniqid(rand(),1)); - $this->_name = ''; - $this->_content = ''; - $this->_mt_elem_flg = FALSE; - $this->_attr_arr = array(); - $this->_child_arr = array(); - $this->_nmspc = ''; - $this->_nmspc_alias = ''; - $this->_parent_id = FALSE; - $this->_parent_node = NULL; - } + public function __construct($id = null) + { + $this->_id = isset($id) ? $id : md5(uniqid(rand(),1)); + $this->_name = ''; + $this->_content = ''; + $this->_mt_elem_flg = false; + $this->_attr_arr = array(); + $this->_child_arr = array(); + $this->_nmspc = ''; + $this->_nmspc_alias = ''; + $this->_parent_id = false; + $this->_parent_node = null; + } - function addChild(&$node) - { - $this->_child_arr[$node->getId()] = $node; - $node->setParentId($this->_id); - $node->setParentNode($this); - } + public function addChild(&$node) + { + $this->_child_arr[$node->getId()] = $node; + $node->setParentId($this->_id); + $node->setParentNode($this); + } - function addChildArr(&$node_arr) - { - $key_arr = array_keys($node_arr); - $num_key = count($key_arr); + public function addChildArr(&$node_arr) + { + $key_arr = array_keys($node_arr); + $num_key = count($key_arr); - for ($i = 0; $i < $num_key; $i++) { - $node = $node_arr[$key_arr[$i]]; - $this->addChild($node); - } - } + for ($i = 0; $i < $num_key; $i++) { + $node = $node_arr[$key_arr[$i]]; + $this->addChild($node); + } + } - function insertChildBefore($idx,&$node) - { - $key_arr = array_keys($this->_child_arr); - $num_key = count($key_arr); - $tmp_arr = arry(); + public function insertChildBefore($idx,&$node) + { + $key_arr = array_keys($this->_child_arr); + $num_key = count($key_arr); + $tmp_arr = arry(); - for ($i = 0;$i < $num_key;$i++) { - if ($i == $idx) { - $tmp_arr[$node->getId()] = $node; - } - $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]]; - } - $this->_child_arr = $tmp_arr; - } + for ($i = 0;$i < $num_key;$i++) { + if ($i == $idx) { + $tmp_arr[$node->getId()] = $node; + } + $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]]; + } + $this->_child_arr = $tmp_arr; + } - function insertChildAfter($idx,&$node) - { - $key_arr = array_keys($this->_child_arr); - $num_key = count($key_arr); - $tmp_arr = arry(); + public function insertChildAfter($idx,&$node) + { + $key_arr = array_keys($this->_child_arr); + $num_key = count($key_arr); + $tmp_arr = arry(); - for ($i = 0;$i < $num_key;$i++) { - $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]]; - if ($i == $idx) { - $tmp_arr[$node->getId()] = $node; - } - } - $this->_child_arr = $tmp_arr; - } + for ($i = 0;$i < $num_key;$i++) { + $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]]; + if ($i == $idx) { + $tmp_arr[$node->getId()] = $node; + } + } + $this->_child_arr = $tmp_arr; + } - function setId($id) - { - $this->_id = $id; - } + public function setId($id) + { + $this->_id = $id; + } - function setName($name) - { - $this->_name = $name; - } + public function setName($name) + { + $this->_name = $name; + } - function setNamepace($nmspc) - { - $this->_nmspc = $nmspc; - } + public function setNamepace($nmspc) + { + $this->_nmspc = $nmspc; + } - function setNamespaceAlias($nmspc_alias) - { - $this->_nmspc_alias = $nmspc_alias; - } + public function setNamespaceAlias($nmspc_alias) + { + $this->_nmspc_alias = $nmspc_alias; + } - function setContent($content) - { - $this->_content = $content; - } + public function setContent($content) + { + $this->_content = $content; + } - function setEmptyElem($mt_elem_flg) - { - $this->_mt_elem_flg = $mt_elem_flg; - } + public function setEmptyElem($mt_elem_flg) + { + $this->_mt_elem_flg = $mt_elem_flg; + } - function setAttr($attr_nm,$attr_val) - { - $this->_attr_arr[$attr_nm] = $attr_val; - } + public function setAttr($attr_nm,$attr_val) + { + $this->_attr_arr[$attr_nm] = $attr_val; + } - function setAttrArr($attr_arr) - { - $this->_attr_arr = $attr_arr; - } + public function setAttrArr($attr_arr) + { + $this->_attr_arr = $attr_arr; + } - function setParentId($id) - { - $this->_parent_id = $id; - } + public function setParentId($id) + { + $this->_parent_id = $id; + } - function setParentNode(&$node) - { - $this->_parent_node = $node; - } + public function setParentNode(&$node) + { + $this->_parent_node = $node; + } - function getId() - { - return($this->_id); - } + public function getId() + { + return($this->_id); + } - function getName() - { - return($this->_name); - } + public function getName() + { + return($this->_name); + } - function getNamespace() - { - return($this->_nmspc); - } + public function getNamespace() + { + return($this->_nmspc); + } - function getNamespaceAlias() - { - return($this->_nmspc_alias); - } + public function getNamespaceAlias() + { + return($this->_nmspc_alias); + } - function getContent() - { - return($this->_content); - } + public function getContent() + { + return($this->_content); + } - function getAttr($attr_nm) - { - if (isset($this->_attr_arr[$attr_nm])) { - return($this->_attr_arr[$attr_nm]); - } else { - return(NULL); - } - } + public function getAttr($attr_nm) + { + if (isset($this->_attr_arr[$attr_nm])) { + return($this->_attr_arr[$attr_nm]); + } else { + return(null); + } + } - function getAttrArr() - { - return($this->_attr_arr); - } + public function getAttrArr() + { + return($this->_attr_arr); + } - function getParentId() - { - return($this->parent_id); - } + public function getParentId() + { + return($this->parent_id); + } - function getParentNode() - { - return($this->_parent_node); - } + public function getParentNode() + { + return($this->_parent_node); + } - function getChild($id) - { - if (isset($this->_child_arr[$id])) { - return($this->_child_arr[$id]); - } else { - return(FALSE); - } - } + public function getChild($id) + { + if (isset($this->_child_arr[$id])) { + return($this->_child_arr[$id]); + } else { + return(false); + } + } - function getFirstChild() - { - $id_arr = array_keys($this->_child_arr); - $num_child = count($id_arr); + public function getFirstChild() + { + $id_arr = array_keys($this->_child_arr); + $num_child = count($id_arr); - if ($num_child > 0) { - return($this->_child_arr[$id_arr[0]]); - } else { - return(FALSE); - } - } + if ($num_child > 0) { + return($this->_child_arr[$id_arr[0]]); + } else { + return(false); + } + } - function getLastChild() - { - $id_arr = array_keys($this->_child_arr); - $num_child = count($id_arr); + public function getLastChild() + { + $id_arr = array_keys($this->_child_arr); + $num_child = count($id_arr); - if ($num_child > 0) { - return($this->_child_arr[$id_arr[$num_child - 1]]); - } else { - return(FALSE); - } - } + if ($num_child > 0) { + return($this->_child_arr[$id_arr[$num_child - 1]]); + } else { + return(false); + } + } - function getChildByIdx($idx) - { - $id_arr = array_keys($this->_child_arr); + public function getChildByIdx($idx) + { + $id_arr = array_keys($this->_child_arr); - if (isset($this->_child_arr[$id_arr[$idx]])) { - return($this->_child_arr[$id_arr[$idx]]); - } else { - return(FALSE); - } - } + if (isset($this->_child_arr[$id_arr[$idx]])) { + return($this->_child_arr[$id_arr[$idx]]); + } else { + return(false); + } + } - function getNumChild() - { - return(count($this->_child_arr)); - } + public function getNumChild() + { + return(count($this->_child_arr)); + } - function removeChild($id) - { - unset($this->_child_arr[$id]); - } + public function removeChild($id) + { + unset($this->_child_arr[$id]); + } - function removeChildByIdx($idx) - { - $key_arr = array_keys($this->_child_arr); - unset($this->_child_arr[$key_arr[$idx]]); - } + public function removeChildByIdx($idx) + { + $key_arr = array_keys($this->_child_arr); + unset($this->_child_arr[$key_arr[$idx]]); + } - function removeFirstChild() - { - $key_arr = array_keys($this->_child_arr); - unset($this->_child_arr[$key_arr[0]]); - } + public function removeFirstChild() + { + $key_arr = array_keys($this->_child_arr); + unset($this->_child_arr[$key_arr[0]]); + } - function removeLastChild() - { - $key_arr = array_keys($this->_child_arr); - unset($this->_child_arr[$key_arr[count($key_arr)-1]]); - } + public function removeLastChild() + { + $key_arr = array_keys($this->_child_arr); + unset($this->_child_arr[$key_arr[count($key_arr)-1]]); + } - function dumpXML($indent_str = "\t") - { - $attr_txt = $this->_dumpAttr(); - $name = $this->_dumpName(); - $xmlns = $this->_dumpXmlns(); - $lvl = $this->_getCurrentLevel(); - $indent = str_pad('',$lvl,$indent_str); + public function dumpXML($indent_str = "\t") + { + $attr_txt = $this->_dumpAttr(); + $name = $this->_dumpName(); + $xmlns = $this->_dumpXmlns(); + $lvl = $this->_getCurrentLevel(); + $indent = str_pad('',$lvl,$indent_str); + + + if ($this->_mt_elem_flg) { + $tag = "$indent<$name$xmlns$attr_txt />"; + return($tag); + } else { + $num_child = 0; + if (!empty($this->_child_arr)) { + $key_arr = array_keys($this->_child_arr); + + $num_child = count($key_arr); + } + + $tag = "$indent<$name$xmlns$attr_txt>$this->_content"; - if ($this->_mt_elem_flg) { - $tag = "$indent<$name$xmlns$attr_txt />"; - return($tag); - } else { - $key_arr = array_keys($this->_child_arr); - $num_child = count($key_arr); + for ($i = 0;$i < $num_child; $i++) { + $node = $this->_child_arr[$key_arr[$i]]; + + //print_r($node); + + $child_txt = $node->dumpXML($indent_str); + $tag .= "\n$child_txt"; + } - $tag = "$indent<$name$xmlns$attr_txt>$this->_content"; + $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>"); + return($tag); + } + } + + public function _dumpAttr() + { + $attr_txt = ''; + if (!empty($this->_attr_arr)) { + $id_arr = array_keys($this->_attr_arr); + $id_arr_cnt = count($id_arr); + + for($i = 0;$i < $id_arr_cnt;$i++) { + $key = $id_arr[$i]; + $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\""; + } + } + return($attr_txt); + } - for ($i = 0;$i < $num_child;$i++) { - $node = $this->_child_arr[$key_arr[$i]]; + public function _dumpName() + { + $alias = $this->getNamespaceAlias(); + if ($alias == '') { + return($this->getName()); + } else { + return("$alias:" . $this->getName()); + } + } - $child_txt = $node->dumpXML($indent_str); - $tag .= "\n$child_txt"; - } + public function _dumpXmlns() + { + $nmspc = $this->getNamespace(); + $alias = $this->getNamespaceAlias(); - $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>"); - return($tag); - } - } + if ($nmspc != '') { + if ($alias == '') { + return(" xmlns=\"" . $nmspc . "\""); + } else { + return(" xmlns:$alias=\"" . $nmspc . "\""); + } + } else { + return(''); + } + } - function _dumpAttr() - { - $id_arr = array_keys($this->_attr_arr); - $id_arr_cnt = count($id_arr); - $attr_txt = ''; - - for($i = 0;$i < $id_arr_cnt;$i++) { - $key = $id_arr[$i]; - $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\""; - } - - return($attr_txt); - } - - function _dumpName() - { - $alias = $this->getNamespaceAlias(); - if ($alias == '') { - return($this->getName()); - } else { - return("$alias:" . $this->getName()); - } - } - - function _dumpXmlns() - { - $nmspc = $this->getNamespace(); - $alias = $this->getNamespaceAlias(); - - if ($nmspc != '') { - if ($alias == '') { - return(" xmlns=\"" . $nmspc . "\""); - } else { - return(" xmlns:$alias=\"" . $nmspc . "\""); - } - } else { - return(''); - } - } - - function _getCurrentLevel() - { - if ($this->_parent_id === FALSE) { - return(0); - } else { - $node = $this->getParentNode(); - $lvl = $node->_getCurrentLevel(); - $lvl++; - return($lvl); - } - } + public function _getCurrentLevel() + { + if ($this->_parent_id === false) { + return 0 ; + } else { + $node = $this->getParentNode(); + if ($node != null) { + $lvl = $node->_getCurrentLevel(); + $lvl++; + return($lvl); + } else { + return 0 ; + } + } + } } class MathMLNode extends XMLNode { - function MathMLNode($id = NULL) - { - parent::XMLNode($id); - } + public function __construct($id = null) + { + parent::__construct($id); + } - function removeBrackets() - { - if ($this->_name == 'mrow') { - if ($c_node_0 = $this->getFirstChild()) { - $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0; - } + public function removeBrackets() + { + if ($this->_name == 'mrow') { + if ($c_node_0 = $this->getFirstChild()) { + $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0; + } - if ($c_node_0 = $this->getLastChild()) { - $c_node_0->isRightBracket() ? $this->removeLastChild() : 0; - } - } - } + if ($c_node_0 = $this->getLastChild()) { + $c_node_0->isRightBracket() ? $this->removeLastChild() : 0; + } + } + } - function isLeftBracket() - { - switch ($this->_content) { - case '{': - case '[': - case '(': - return(TRUE); - break; - } - return(FALSE); - } + public function isLeftBracket() + { + switch ($this->_content) { + case '{': + case '[': + case '(': + return(true); + break; + } + return(false); + } - function isRightBracket() - { - switch ($this->_content) { - case '}': - case ']': - case ')': - return(TRUE); - break; - } - return(FALSE); - } + public function isRightBracket() + { + switch ($this->_content) { + case '}': + case ']': + case ')': + return(true); + break; + } + return(false); + } } class ASCIIMathPHP { - var $_expr; - var $_curr_expr; - var $_prev_expr; - var $_symbol_arr; - var $_node_arr; - var $_node_cntr; + protected $_expr; + protected $_curr_expr; + protected $_prev_expr; + protected $_symbol_arr; + protected $_node_arr; + protected $_node_cntr; - function ASCIIMathPHP($symbol_arr,$expr = NULL) - { - $this->_symbol_arr = $symbol_arr; - if (isset($expr)) { - $this->setExpr($expr); - } - } + public function __construct($symbol_arr, $expr = null) { + $this->_symbol_arr = $symbol_arr; + if (isset($expr)) { + $this->setExpr($expr); + } + } - /** - * Returns an empty node (containing a non-breaking space) 26-Apr-2006 - * - * Used when an expression is incomplete - * - * @return object - * - * @access private - */ - function emptyNode() - { - $tmp_node = $this->createNode(); - $tmp_node->setName('mn'); - $tmp_node->setContent('&#' . hexdec('200B') . ';'); - return $tmp_node; - } + /** + * Returns an empty node (containing a non-breaking space) 26-Apr-2006 + * + * Used when an expression is incomplete + * + * @return object + * + * @access private + */ + public function emptyNode() + { + $tmp_node = $this->createNode(); + $tmp_node->setName('mn'); + $tmp_node->setContent('&#' . hexdec('200B') . ';'); + return $tmp_node; + } - function pushExpr($prefix) // 2005-06-11 wes - { - $this->_curr_expr = $prefix . $this->_curr_expr; - } + public function pushExpr($prefix) // 2005-06-11 wes + { + $this->_curr_expr = $prefix . $this->_curr_expr; + } - function setExpr($expr) - { - $this->_expr = $expr; - $this->_curr_expr = $expr; - $this->_prev_expr = $expr; + public function setExpr($expr) + { + $this->_expr = $expr; + $this->_curr_expr = $expr; + $this->_prev_expr = $expr; - $this->_node_arr = array(); - $this->_node_cntr = 0; - } + $this->_node_arr = array(); + $this->_node_cntr = 0; + } - function genMathML($attr_arr = NULL) - { - // <math> node - $node_0 = $this->createNode(); - $node_0->setName('math'); - $node_0->setNamepace('http://www.w3.org/1998/Math/MathML'); + public function genMathML($attr_arr = null) + { + // <math> node + $node_0 = $this->createNode(); + $node_0->setName('math'); + $node_0->setNamepace('http://www.w3.org/1998/Math/MathML'); - // <mstyle> node - if (isset($attr_arr)) { - $node_1 = $this->createNode(); - $node_1->setName('mstyle'); - $node_1->setAttrArr($attr_arr); + // <mstyle> node + if (isset($attr_arr)) { + $node_1 = $this->createNode(); + $node_1->setName('mstyle'); + $node_1->setAttrArr($attr_arr); - $node_arr = $this->parseExpr(); + $node_arr = $this->parseExpr(); - $node_1->addChildArr($node_arr); - $node_0->addChild($node_1); - } else { - $node_arr = $this->parseExpr(); - $node_0->addCh... [truncated message content] |
From: <var...@us...> - 2016-10-14 15:39:24
|
Revision: 9971 http://sourceforge.net/p/phpwiki/code/9971 Author: vargenau Date: 2016-10-14 15:39:20 +0000 (Fri, 14 Oct 2016) Log Message: ----------- Update highlight.js to version 9.7.0 Modified Paths: -------------- trunk/pgsrc/ReleaseNotes trunk/themes/default/highlight.js/CHANGES.md trunk/themes/default/highlight.js/README.md trunk/themes/default/highlight.js/README.ru.md trunk/themes/default/highlight.js/highlight.pack.js trunk/themes/default/highlight.js/styles/arta.css trunk/themes/default/highlight.js/styles/ascetic.css trunk/themes/default/highlight.js/styles/dark.css trunk/themes/default/highlight.js/styles/default.css trunk/themes/default/highlight.js/styles/docco.css trunk/themes/default/highlight.js/styles/far.css trunk/themes/default/highlight.js/styles/foundation.css trunk/themes/default/highlight.js/styles/github.css trunk/themes/default/highlight.js/styles/googlecode.css trunk/themes/default/highlight.js/styles/idea.css trunk/themes/default/highlight.js/styles/magula.css trunk/themes/default/highlight.js/styles/mono-blue.css trunk/themes/default/highlight.js/styles/monokai.css trunk/themes/default/highlight.js/styles/obsidian.css trunk/themes/default/highlight.js/styles/pojoaque.css trunk/themes/default/highlight.js/styles/railscasts.css trunk/themes/default/highlight.js/styles/rainbow.css trunk/themes/default/highlight.js/styles/sunburst.css trunk/themes/default/highlight.js/styles/tomorrow-night-blue.css trunk/themes/default/highlight.js/styles/tomorrow-night-bright.css trunk/themes/default/highlight.js/styles/tomorrow-night-eighties.css trunk/themes/default/highlight.js/styles/tomorrow-night.css trunk/themes/default/highlight.js/styles/tomorrow.css trunk/themes/default/highlight.js/styles/vs.css trunk/themes/default/highlight.js/styles/xcode.css trunk/themes/default/highlight.js/styles/zenburn.css Added Paths: ----------- trunk/themes/default/highlight.js/styles/agate.css trunk/themes/default/highlight.js/styles/androidstudio.css trunk/themes/default/highlight.js/styles/arduino-light.css trunk/themes/default/highlight.js/styles/atelier-cave-dark.css trunk/themes/default/highlight.js/styles/atelier-cave-light.css trunk/themes/default/highlight.js/styles/atelier-dune-dark.css trunk/themes/default/highlight.js/styles/atelier-dune-light.css trunk/themes/default/highlight.js/styles/atelier-estuary-dark.css trunk/themes/default/highlight.js/styles/atelier-estuary-light.css trunk/themes/default/highlight.js/styles/atelier-forest-dark.css trunk/themes/default/highlight.js/styles/atelier-forest-light.css trunk/themes/default/highlight.js/styles/atelier-heath-dark.css trunk/themes/default/highlight.js/styles/atelier-heath-light.css trunk/themes/default/highlight.js/styles/atelier-lakeside-dark.css trunk/themes/default/highlight.js/styles/atelier-lakeside-light.css trunk/themes/default/highlight.js/styles/atelier-plateau-dark.css trunk/themes/default/highlight.js/styles/atelier-plateau-light.css trunk/themes/default/highlight.js/styles/atelier-savanna-dark.css trunk/themes/default/highlight.js/styles/atelier-savanna-light.css trunk/themes/default/highlight.js/styles/atelier-seaside-dark.css trunk/themes/default/highlight.js/styles/atelier-seaside-light.css trunk/themes/default/highlight.js/styles/atelier-sulphurpool-dark.css trunk/themes/default/highlight.js/styles/atelier-sulphurpool-light.css trunk/themes/default/highlight.js/styles/atom-one-dark.css trunk/themes/default/highlight.js/styles/atom-one-light.css trunk/themes/default/highlight.js/styles/brown-paper.css trunk/themes/default/highlight.js/styles/brown-papersq.png trunk/themes/default/highlight.js/styles/codepen-embed.css trunk/themes/default/highlight.js/styles/color-brewer.css trunk/themes/default/highlight.js/styles/darcula.css trunk/themes/default/highlight.js/styles/darkula.css trunk/themes/default/highlight.js/styles/dracula.css trunk/themes/default/highlight.js/styles/github-gist.css trunk/themes/default/highlight.js/styles/grayscale.css trunk/themes/default/highlight.js/styles/gruvbox-dark.css trunk/themes/default/highlight.js/styles/gruvbox-light.css trunk/themes/default/highlight.js/styles/hopscotch.css trunk/themes/default/highlight.js/styles/hybrid.css trunk/themes/default/highlight.js/styles/ir-black.css trunk/themes/default/highlight.js/styles/kimbie.dark.css trunk/themes/default/highlight.js/styles/kimbie.light.css trunk/themes/default/highlight.js/styles/monokai-sublime.css trunk/themes/default/highlight.js/styles/ocean.css trunk/themes/default/highlight.js/styles/paraiso-dark.css trunk/themes/default/highlight.js/styles/paraiso-light.css trunk/themes/default/highlight.js/styles/purebasic.css trunk/themes/default/highlight.js/styles/qtcreator_dark.css trunk/themes/default/highlight.js/styles/qtcreator_light.css trunk/themes/default/highlight.js/styles/school-book.css trunk/themes/default/highlight.js/styles/school-book.png trunk/themes/default/highlight.js/styles/solarized-dark.css trunk/themes/default/highlight.js/styles/solarized-light.css trunk/themes/default/highlight.js/styles/xt256.css Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2016-10-14 11:00:13 UTC (rev 9970) +++ trunk/pgsrc/ReleaseNotes 2016-10-14 15:39:20 UTC (rev 9971) @@ -1,4 +1,4 @@ -Date: Fri, 14 Oct 2016 12:59:38 +0000 +Date: Fri, 14 Oct 2016 17:38:47 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -21,6 +21,7 @@ * Replace ##ereg## functions * Update Adodb to version 5.20.7 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com) +* Update highlight.js to version 9.7.0 * Allow Wikicreole syntax for plugins in theme templates * Valid HTML5 and CSS3 logos (in debug mode) * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. Modified: trunk/themes/default/highlight.js/CHANGES.md =================================================================== --- trunk/themes/default/highlight.js/CHANGES.md 2016-10-14 11:00:13 UTC (rev 9970) +++ trunk/themes/default/highlight.js/CHANGES.md 2016-10-14 15:39:20 UTC (rev 9971) @@ -1,5 +1,675 @@ -## Version 8.0 beta +## Version 9.7.0 +A comprehensive bugfix release. This is one of the best things about +highlight.js: even boring things keep getting better (even if slow). + +- VHDL updated with PSL keywords and uses more consistent styling. +- Nested C-style comments no longer break highlighting in many languages. +- JavaScript updated with `=>` functions, highlighted object attributes and + parsing within template string substitution blocks (`${...}`). +- Fixed another corner case with self-closing `<tag/>` in JSX. +- Added `HEALTHCHECK` directive in Docker. +- Delphi updated with new Free Pascal keywords. +- Fixed digit separator parsing in C++. +- C# updated with new keywords and fixed to allow multiple identifiers within + generics `<...>`. +- Fixed another slow regex in Less. + + +## Version 9.6.0 + +New languages: + +- *ABNF* and *EBNF* by [Alex McKibben][] +- *Awk* by [Matthew Daly][] +- *SubUnit* by [Sergey Bronnikov][] + +New styles: + +- *Atom One* in both Dark and Light variants by [Daniel Gamage][] + +Plus, a few smaller updates for *Lasso*, *Elixir*, *C++* and *SQL*. + +[Alex McKibben]: https://github.com/mckibbenta +[Daniel Gamage]: https://github.com/danielgamage +[Matthew Daly]: https://github.com/matthewbdaly +[Sergey Bronnikov]: https://github.com/ligurio + + +## Version 9.5.0 + +New languages: + +- *Excel* by [Victor Zhou][] +- *Linden Scripting Language* by [Builder's Brewery][] +- *TAP* (Test Anything Protocol) by [Sergey Bronnikov][] +- *Pony* by [Joe Eli McIlvain][] +- *Coq* by [Stephan Boyer][] +- *dsconfig* and *LDIF* by [Jacob Childress][] + +New styles: + +- *Ocean Dark* by [Gavin Siu][] + +Notable changes: + +- [Minh Nguyễn][] added more built-ins to Objective C. +- [Jeremy Hull][] fixed corner cases in C++ preprocessor directives and Diff + comments. +- [Victor Zhou][] added support for digit separators in C++ numbers. + +[Gavin Siu]: https://github.com/gavsiu +[Builder's Brewery]: https://github.com/buildersbrewery +[Victor Zhou]: https://github.com/OiCMudkips +[Sergey Bronnikov]: https://github.com/ligurio +[Joe Eli McIlvain]: https://github.com/jemc +[Stephan Boyer]: https://github.com/boyers +[Jacob Childress]: https://github.com/braveulysses +[Minh Nguyễn]: https://github.com/1ec5 +[Jeremy Hull]: https://github.com/sourrust + + +## Version 9.4.0 + +New languages: + +- *PureBASIC* by [Tristano Ajmone][] +- *BNF* by [Oleg Efimov][] +- *Ada* by [Lars Schulna][] + +New styles: + +- *PureBASIC* by [Tristano Ajmone][] + +Improvements to existing languages and styles: + +- We now highlight function declarations in Go. +- [Taisuke Fujimoto][] contributed very convoluted rules for raw and + interpolated strings in C#. +- [Boone Severson][] updated Verilog to comply with IEEE 1800-2012 + SystemVerilog. +- [Victor Zhou][] improved rules for comments and strings in PowerShell files. +- [Janis Voigtländer][] updated the definition of Elm to version 0.17 of the + languages. Elm is now featured on the front page of <https://highlightjs.org>. +- Special variable `$this` is highlighted as a keyword in PHP. +- `usize` and `isize` are now highlighted in Rust. +- Fixed labels and directives in x86 assembler. + +[Tristano Ajmone]: https://github.com/tajmone +[Taisuke Fujimoto]: https://github.com/temp-impl +[Oleg Efimov]: https://github.com/Sannis +[Boone Severson]: https://github.com/BooneJS +[Victor Zhou]: https://github.com/OiCMudkips +[Lars Schulna]: https://github.com/captain-hanuta +[Janis Voigtländer]: https://github.com/jvoigtlaender + + +## Version 9.3.0 + +New languages: + +- *Tagger Script* by [Philipp Wolfer][] +- *MoonScript* by [Billy Quith][] + +New styles: + +- *xt256* by [Herbert Shin][] + +Improvements to existing languages and styles: + +- More robust handling of unquoted HTML tag attributes +- Relevance tuning for QML which was unnecessary eager at seizing other + languages' code +- Improve GAMS language parsing +- Fixed a bunch of bugs around selectors in Less +- Kotlin's got a new definition for annotations, updated keywords and other + minor improvements +- Added `move` to Rust keywords +- Markdown now recognizes \`\`\`-fenced code blocks +- Improved detection of function declarations in C++ and C# + +[Philipp Wolfer]: https://github.com/phw +[Billy Quith]: https://github.com/billyquith +[Herbert Shin]: https://github.com/initbar + + +## Version 9.2.0 + +New languages: + +- *QML* by [John Foster][] +- *HTMLBars* by [Michael Johnston][] +- *CSP* by [Taras][] +- *Maxima* by [Robert Dodier][] + +New styles: + +- *Gruvbox* by [Qeole][] +- *Dracula* by [Denis Ciccale][] + +Improvements to existing languages and styles: + +- We now correctly handle JSX with arbitrary node tree depth. +- Argument list for `(lambda)` in Scheme is no longer highlighted as a function + call. +- Stylus syntax doesn't break on valid CSS. +- More correct handling of comments and strings and other improvements for + VimScript. +- More subtle work on the default style. +- We now use anonymous modules for AMD. +- `macro_rules!` is now recognized as a built-in in Rust. + +[John Foster]: https://github.com/jf990 +[Qeole]: https://github.com/Qeole +[Denis Ciccale]: https://github.com/dciccale +[Michael Johnston]: https://github.com/lastobelus +[Taras]: https://github.com/oxdef +[Robert Dodier]: https://github.com/robert-dodier + + +## Version 9.1.0 + +New languages: + +- *Stan* by [Brendan Rocks][] +- *BASIC* by [Raphaël Assénat][] +- *GAUSS* by [Matt Evans][] +- *DTS* by [Martin Braun][] +- *Arduino* by [Stefania Mellai][] + +New Styles: + +- *Arduino Light* by [Stefania Mellai][] + +Improvements to existing languages and styles: + +- Handle return type annotations in Python +- Allow shebang headers in Javascript +- Support strings in Rust meta +- Recognize `struct` as a class-level definition in Rust +- Recognize b-prefixed chars and strings in Rust +- Better numbers handling in Verilog + +[Brendan Rocks]: http://brendanrocks.com +[Raphaël Assénat]: https://github.com/raphnet +[Matt Evans]: https://github.com/matthewevans +[Martin Braun]: https://github.com/mbr0wn +[Stefania Mellai]: https://github.com/smellai + + +## Version 9.0.0 + +The new major version brings a reworked styling system. Highlight.js now defines +a limited set of highlightable classes giving a consistent result across all the +styles and languages. You can read a more detailed explanation and background in +the [tracking issue][#348] that started this long process back in May. + +This change is backwards incompatible for those who uses highlight.js with a +custom stylesheet. The [new style guide][sg] explains how to write styles +in this new world. + +Bundled themes have also suffered a significant amount of improvements and may +look different in places, but all the things now consistent and make more sense. +Among others, the Default style has got a refresh and will probably be tweaked +some more in next releases. Please do give your feedback in our +[issue tracker][issues]. + +New languages in this release: + +- *Caché Object Script* by [Nikita Savchenko][] +- *YAML* by [Stefan Wienert][] +- *MIPS Assembler* by [Nebuleon Fumika][] +- *HSP* by [prince][] + +Improvements to existing languages and styles: + +- ECMAScript 6 modules import now do not require closing semicolon. +- ECMAScript 6 classes constructors now highlighted. +- Template string support for Typescript, as for ECMAScript 6. +- Scala case classes params highlight fixed. +- Built-in names introduced in Julia v0.4 added by [Kenta Sato][]. +- Refreshed Default style. + +Other notable changes: + +- [Web workers support][webworkers] added bu [Jan Kühle][]. +- We now have tests for compressed browser builds as well. +- The building tool chain has been switched to node.js 4.x. and is now + shamelessly uses ES6 features all over the place, courtesy of [Jeremy Hull][]. +- License added to non-compressed browser build. + +[Jan Kühle]: https://github.com/frigus02 +[Stefan Wienert]: https://github.com/zealot128 +[Kenta Sato]: https://github.com/bicycle1885 +[Nikita Savchenko]: https://github.com/ZitRos +[webworkers]: https://github.com/isagalaev/highlight.js#web-workers +[Jeremy Hull]: https://github.com/sourrust +[#348]: https://github.com/isagalaev/highlight.js/issues/348 +[sg]: http://highlightjs.readthedocs.org/en/latest/style-guide.html +[issues]: https://github.com/isagalaev/highlight.js/issues +[Nebuleon Fumika]: https://github.com/Nebuleon +[prince]: https://github.com/prince-0203 + + +## Version 8.9.1 + +Some last-minute changes reverted due to strange bug with minified browser build: + +- Scala case classes params highlight fixed +- ECMAScript 6 modules import now do not require closing semicolon +- ECMAScript 6 classes constructors now highlighted +- Template string support for Typescript, as for ECMAScript 6 +- License added to not minified browser build + + +## Version 8.9.0 + +New languages: + +- *crmsh* by [Kristoffer Gronlund][] +- *SQF* by [Soren Enevoldsen][] + +[Kristoffer Gronlund]: https://github.com/krig +[Soren Enevoldsen]: https://github.com/senevoldsen90 + +Notable fixes and improvements to existing languages: + +- Added `abstract` and `namespace` keywords to TypeScript by [Daniel Rosenwasser][] +- Added `label` support to Dockerfile by [Ladislav Prskavec][] +- Crystal highlighting improved by [Tsuyusato Kitsune][] +- Missing Swift keywords added by [Nate Cook][] +- Improve detection of C block comments +- ~~Scala case classes params highlight fixed~~ +- ~~ECMAScript 6 modules import now do not require closing semicolon~~ +- ~~ECMAScript 6 classes constructors now highlighted~~ +- ~~Template string support for Typescript, as for ECMAScript 6~~ + +Other notable changes: + +- ~~License added to not minified browser build~~ + +[Kristoffer Gronlund]: https://github.com/krig +[Søren Enevoldsen]: https://github.com/senevoldsen90 +[Daniel Rosenwasser]: https://github.com/DanielRosenwasser +[Ladislav Prskavec]: https://github.com/abtris +[Tsuyusato Kitsune]: https://github.com/MakeNowJust +[Nate Cook]: https://github.com/natecook1000 + + +## Version 8.8.0 + +New languages: + +- *Golo* by [Philippe Charrière][] +- *GAMS* by [Stefan Bechert][] +- *IRPF90* by [Anthony Scemama][] +- *Access logs* by [Oleg Efimov][] +- *Crystal* by [Tsuyusato Kitsune][] + +Notable fixes and improvements to existing languages: + +- JavaScript highlighting no longer fails with ES6 default parameters +- Added keywords `async` and `await` to Python +- PHP heredoc support improved +- Allow preprocessor directives within C++ functions + +Other notable changes: + +- Change versions to X.Y.Z SemVer-compatible format +- Added ability to build all targets at once + +[Philippe Charrière]: https://github.com/k33g +[Stefan Bechert]: https://github.com/b-pos465 +[Anthony Scemama]: https://github.com/scemama +[Oleg Efimov]: https://github.com/Sannis +[Tsuyusato Kitsune]: https://github.com/MakeNowJust + + +## Version 8.7 + +New languages: + +- *Zephir* by [Oleg Efimov][] +- *Elm* by [Janis Voigtländer][] +- *XQuery* by [Dirk Kirsten][] +- *Mojolicious* by [Dotan Dimet][] +- *AutoIt* by Manh Tuan from [J2TeaM][] +- *Toml* (ini extension) by [Guillaume Gomez][] + +New styles: + +- *Hopscotch* by [Jan T. Sott][] +- *Grayscale* by [MY Sun][] + +Notable fixes and improvements to existing languages: + +- Fix encoding of images when copied over in certain builds +- Fix incorrect highlighting of the word "bug" in comments +- Treat decorators different from matrix multiplication in Python +- Fix traits inheritance highlighting in Rust +- Fix incorrect document +- Oracle keywords added to SQL language definition by [Vadimtro][] +- Postgres keywords added to SQL language definition by [Benjamin Auder][] +- Fix registers in x86asm being highlighted as a hex number +- Fix highlighting for numbers with a leading decimal point +- Correctly highlight numbers and strings inside of C/C++ macros +- C/C++ functions now support pointer, reference, and move returns + +[Oleg Efimov]: https://github.com/Sannis +[Guillaume Gomez]: https://github.com/GuillaumeGomez +[Janis Voigtländer]: https://github.com/jvoigtlaender +[Jan T. Sott]: https://github.com/idleberg +[Dirk Kirsten]: https://github.com/dirkk +[MY Sun]: https://github.com/simonmysun +[Vadimtro]: https://github.com/Vadimtro +[Benjamin Auder]: https://github.com/ghost +[Dotan Dimet]: https://github.com/dotandimet +[J2TeaM]: https://github.com/J2TeaM + + +## Version 8.6 + +New languages: + +- *C/AL* by [Kenneth Fuglsang][] +- *DNS zone file* by [Tim Schumacher][] +- *Ceylon* by [Lucas Werkmeister][] +- *OpenSCAD* by [Dan Panzarella][] +- *Inform7* by [Bruno Dias][] +- *armasm* by [Dan Panzarella][] +- *TP* by [Jay Strybis][] + +New styles: + +- *Atelier Cave*, *Atelier Estuary*, + *Atelier Plateau* and *Atelier Savanna* by [Bram de Haan][] +- *Github Gist* by [Louis Barranqueiro][] + +Notable fixes and improvements to existing languages: + +- Multi-line raw strings from C++11 are now supported +- Fix class names with dashes in HAML +- The `async` keyword from ES6/7 is now supported +- TypeScript functions handle type and parameter complexity better +- We unified phpdoc/javadoc/yardoc etc modes across all languages +- CSS .class selectors relevance was dropped to prevent wrong language detection +- Images is now included to CDN build +- Release process is now automated + +[Bram de Haan]: https://github.com/atelierbram +[Kenneth Fuglsang]: https://github.com/kfuglsang +[Louis Barranqueiro]: https://github.com/LouisBarranqueiro +[Tim Schumacher]: https://github.com/enko +[Lucas Werkmeister]: https://github.com/lucaswerkmeister +[Dan Panzarella]: https://github.com/pzl +[Bruno Dias]: https://github.com/sequitur +[Jay Strybis]: https://github.com/unreal + + +## Version 8.5 + +New languages: + +- *pf.conf* by [Peter Piwowarski][] +- *Julia* by [Kenta Sato][] +- *Prolog* by [Raivo Laanemets][] +- *Docker* by [Alexis Hénaut][] +- *Fortran* by [Anthony Scemama][] and [Thomas Applencourt][] +- *Kotlin* by [Sergey Mashkov][] + +New styles: + +- *Agate* by [Taufik Nurrohman][] +- *Darcula* by [JetBrains][] +- *Atelier Sulphurpool* by [Bram de Haan][] +- *Android Studio* by [Pedro Oliveira][] + +Notable fixes and improvements to existing languages: + +- ES6 features in JavaScript are better supported now by [Gu Yiling][]. +- Swift now recognizes body-less method definitions. +- Single expression functions `def foo, do: ... ` now work in Elixir. +- More uniform detection of built-in classes in Objective C. +- Fixes for number literals and processor directives in Rust. +- HTML `<script>` tag now allows any language, not just JavaScript. +- Multi-line comments are supported now in MatLab. + +[Taufik Nurrohman]: https://github.com/tovic +[Jet Brains]: https://www.jetbrains.com/ +[Peter Piwowarski]: https://github.com/oldlaptop +[Kenta Sato]: https://github.com/bicycle1885 +[Bram de Haan]: https://github.com/atelierbram +[Raivo Laanemets]: https://github.com/rla +[Alexis Hénaut]: https://github.com/AlexisNo +[Anthony Scemama]: https://github.com/scemama +[Pedro Oliveira]: https://github.com/kanytu +[Gu Yiling]: https://github.com/Justineo +[Sergey Mashkov]: https://github.com/cy6erGn0m +[Thomas Applencourt]: https://github.com/TApplencourt + + +## Version 8.4 + +We've got the new [demo page][]! The obvious new feature is the new look, but +apart from that it's got smarter: by presenting languages in groups it avoids +running 10000 highlighting attempts after first load which was slowing it down +and giving bad overall impression. It is now also being generated from test +code snippets so the authors of new languages don't have to update both tests +and the demo page with the same thing. + +Other notable changes: + +- The `template_comment` class is gone in favor of the more general `comment`. +- Number parsing unified and improved across languages. +- C++, Java and C# now use unified grammar to highlight titles in + function/method definitions. +- The browser build is now usable as an AMD module, there's no separate build + target for that anymore. +- OCaml has got a [comprehensive overhaul][ocaml] by [Mickaël Delahaye][]. +- Clojure's data structures and literals are now highlighted outside of lists + and we can now highlight Clojure's REPL sessions. + +New languages: + +- *AspectJ* by [Hakan Özler][] +- *STEP Part 21* by [Adam Joseph Cook][] +- *SML* derived by [Edwin Dalorzo][] from OCaml definition +- *Mercury* by [mucaho][] +- *Smali* by [Dennis Titze][] +- *Verilog* by [Jon Evans][] +- *Stata* by [Brian Quistorff][] + +[Hakan Özler]: https://github.com/ozlerhakan +[Adam Joseph Cook]: https://github.com/adamjcook +[demo page]: https://highlightjs.org/static/demo/ +[Ivan Sagalaev]: https://github.com/isagalaev +[Edwin Dalorzo]: https://github.com/edalorzo +[mucaho]: https://github.com/mucaho +[Dennis Titze]: https://github.com/titze +[Jon Evans]: https://github.com/craftyjon +[Brian Quistorff]: https://github.com/bquistorff +[ocaml]: https://github.com/isagalaev/highlight.js/pull/608#issue-46190207 +[Mickaël Delahaye]: https://github.com/polazarus + + +## Version 8.3 + +We streamlined our tool chain, it is now based entirely on node.js instead of +being a mix of node.js, Python and Java. The build script options and arguments +remained the same, and we've noted all the changes in the [documentation][b]. +Apart from reducing complexity, the new build script is also faster from not +having to start Java machine repeatedly. The credits for the work go to [Jeremy +Hull][]. + +Some notable fixes: + +- PHP and JavaScript mixed in HTML now live happily with each other. +- JavaScript regexes now understand ES6 flags "u" and "y". +- `throw` keyword is no longer detected as a method name in Java. +- Fixed parsing of numbers and symbols in Clojure thanks to [input from Ivan + Kleshnin][ik]. + +New languages in this release: + +- *Less* by [Max Mikhailov][] +- *Stylus* by [Bryant Williams][] +- *Tcl* by [Radek Liska][] +- *Puppet* by [Jose Molina Colmenero][] +- *Processing* by [Erik Paluka][] +- *Twig* templates by [Luke Holder][] +- *PowerShell* by [David Mohundro][], based on [the work of Nicholas Blumhardt][ps] +- *XL* by [Christophe de Dinechin][] +- *LiveScript* by [Taneli Vatanen][] and [Jen Evers-Corvina][] +- *ERB* (Ruby in HTML) by [Lucas Mazza][] +- *Roboconf* by [Vincent Zurczak][] + +[b]: http://highlightjs.readthedocs.org/en/latest/building-testing.html +[Jeremy Hull]: https://github.com/sourrust +[ik]: https://twitter.com/IvanKleshnin/status/514041599484231680 +[Max Mikhailov]: https://github.com/seven-phases-max +[Bryant Williams]: https://github.com/scien +[Radek Liska]: https://github.com/Nindaleth +[Jose Molina Colmenero]: https://github.com/Moliholy +[Erik Paluka]: https://github.com/paluka +[Luke Holder]: https://github.com/lukeholder +[David Mohundro]: https://github.com/drmohundro +[ps]: https://github.com/OctopusDeploy/Library/blob/master/app/shared/presentation/highlighting/powershell.js +[Christophe de Dinechin]: https://github.com/c3d +[Taneli Vatanen]: https://github.com/Daiz- +[Jen Evers-Corvina]: https://github.com/sevvie +[Lucas Mazza]: https://github.com/lucasmazza +[Vincent Zurczak]: https://github.com/vincent-zurczak + + +## Version 8.2 + +We've finally got [real tests][test] and [continuous testing on Travis][ci] +thanks to [Jeremy Hull][] and [Chris Eidhof][]. The tests designed to cover +everything: language detection, correct parsing of individual language features +and various special cases. This is a very important change that gives us +confidence in extending language definitions and refactoring library core. + +We're going to redesign the old [demo/test suite][demo] into an interactive +demo web app. If you're confident front-end developer or designer and want to +help us with it, drop a comment into [the issue][#542] on GitHub. + +[test]: https://github.com/isagalaev/highlight.js/tree/master/test +[demo]: https://highlightjs.org/static/test.html +[#542]: https://github.com/isagalaev/highlight.js/issues/542 +[ci]: https://travis-ci.org/isagalaev/highlight.js +[Jeremy Hull]: https://github.com/sourrust +[Chris Eidhof]: https://github.com/chriseidhof + +As usually there's a handful of new languages in this release: + +- *Groovy* by [Guillaume Laforge][] +- *Dart* by [Maxim Dikun][] +- *Dust* by [Michael Allen][] +- *Scheme* by [JP Verkamp][] +- *G-Code* by [Adam Joseph Cook][] +- *Q* from Kx Systems by [Sergey Vidyuk][] + +[Guillaume Laforge]: https://github.com/glaforge +[Maxim Dikun]: https://github.com/dikmax +[Michael Allen]: https://github.com/bfui +[JP Verkamp]: https://github.com/jpverkamp +[Adam Joseph Cook]: https://github.com/adamjcook +[Sergey Vidyuk]: https://github.com/sv + +Other improvements: + +- [Erik Osheim][] heavily reworked Scala definitions making it richer. +- [Lucas Mazza][] fixed Ruby hashes highlighting +- Lisp variants (Lisp, Clojure and Scheme) are unified in regard to naming + the first symbol in parentheses: it's "keyword" in general case and also + "built_in" for built-in functions in Clojure and Scheme. + +[Erik Osheim]: https://github.com/non +[Lucas Mazza]: https://github.com/lucasmazza + + +## Version 8.1 + +New languages: + +- *Gherkin* by [Sam Pikesley][] +- *Elixir* by [Josh Adams][] +- *NSIS* by [Jan T. Sott][] +- *VIM script* by [Jun Yang][] +- *Protocol Buffers* by [Dan Tao][] +- *Nix* by [Domen Kožar][] +- *x86asm* by [innocenat][] +- *Cap’n Proto* and *Thrift* by [Oleg Efimov][] +- *Monkey* by [Arthur Bikmullin][] +- *TypeScript* by [Panu Horsmalahti][] +- *Nimrod* by [Flaviu Tamas][] +- *Gradle* by [Damian Mee][] +- *Haxe* by [Christopher Kaster][] +- *Swift* by [Chris Eidhof][] and [Nate Cook][] + +New styles: + +- *Kimbie*, light and dark variants by [Jan T. Sott][] +- *Color brewer* by [Fabrício Tavares de Oliveira][] +- *Codepen.io embed* by [Justin Perry][] +- *Hybrid* by [Nic West][] + +[Sam Pikesley]: https://github.com/pikesley +[Sindre Sorhus]: https://github.com/sindresorhus +[Josh Adams]: https://github.com/knewter +[Jan T. Sott]: https://github.com/idleberg +[Jun Yang]: https://github.com/harttle +[Dan Tao]: https://github.com/dtao +[Domen Kožar]: https://github.com/iElectric +[innocenat]: https://github.com/innocenat +[Oleg Efimov]: https://github.com/Sannis +[Arthur Bikmullin]: https://github.com/devolonter +[Panu Horsmalahti]: https://github.com/panuhorsmalahti +[Flaviu Tamas]: https://github.com/flaviut +[Damian Mee]: https://github.com/chester1000 +[Christopher Kaster]: http://christopher.kaster.ws +[Fabrício Tavares de Oliveira]: https://github.com/fabriciotav +[Justin Perry]: https://github.com/ourmaninamsterdam +[Nic West]: https://github.com/nicwest +[Chris Eidhof]: https://github.com/chriseidhof +[Nate Cook]: https://github.com/natecook1000 + +Other improvements: + +- The README is heavily reworked and brought up to date by [Jeremy Hull][]. +- Added [`listLanguages()`][ll] method in the API. +- Improved C/C++/C# detection. +- Added a bunch of new language aliases, documented the existing ones. Thanks to + [Sindre Sorhus][] for background research. +- Added phrasal English words to boost relevance in comments. +- Many improvements to SQL definition made by [Heiko August][], + [Nikolay Lisienko][] and [Travis Odom][]. +- The shorter `lang-` prefix for language names in HTML classes supported + alongside `language-`. Thanks to [Jeff Escalante][]. +- Ruby's got support for interactive console sessions. Thanks to + [Pascal Hurni][]. +- Added built-in functions for R language. Thanks to [Artem A. Klevtsov][]. +- Rust's got definition for lifetime parameters and improved string syntax. + Thanks to [Roman Shmatov][]. +- Various improvements to Objective-C definition by [Matt Diephouse][]. +- Fixed highlighting of generics in Java. + +[ll]: http://highlightjs.readthedocs.org/en/latest/api.html#listlanguages +[Sindre Sorhus]: https://github.com/sindresorhus +[Heiko August]: https://github.com/auge8472 +[Nikolay Lisienko]: https://github.com/neor-ru +[Travis Odom]: https://github.com/Burstaholic +[Jeff Escalante]: https://github.com/jenius +[Pascal Hurni]: https://github.com/phurni +[Jiyin Yiyong]: https://github.com/jiyinyiyong +[Artem A. Klevtsov]: https://github.com/unikum +[Roman Shmatov]: https://github.com/shmatov +[Jeremy Hull]: https://github.com/sourrust +[Matt Diephouse]: https://github.com/mdiep + + +## Version 8.0 + This new major release is quite a big overhaul bringing both new features and some backwards incompatible changes. However, chances are that the majority of users won't be affected by the latter: the basic scenario described in the @@ -47,7 +717,7 @@ aliases can be specified in the class attribute of the code container in your HTML as well as in various API calls. For now there are only a few very common aliases but we'll expand it in the future. All of them are listed in the - [class reference][]. + [class reference][cr]. - Language detection can now be restricted to a subset of languages relevant in a given context — a web page or even a single highlighting call. This is @@ -68,7 +738,7 @@ - *Atelier* family of styles in 10 variants by [Bram de Haan][] - *Paraíso* styles by [Jan T. Sott][] -Miscelleanous improvements: +Miscellaneous improvements: - Highlighting `=>` prompts in Clojure. - [Jeremy Hull][] fixed a lot of styles for consistency. @@ -77,6 +747,8 @@ - Big overhaul of relevance counting for a number of languages. Please do report bugs about mis-detection of non-trivial code snippets! +[API reference]: http://highlightjs.readthedocs.org/en/latest/api.html + [cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html [api docs]: http://highlightjs.readthedocs.org/en/latest/api.html [variants]: https://groups.google.com/d/topic/highlightjs/VoGC9-1p5vk/discussion @@ -118,7 +790,7 @@ - Haskell's got new keywords and now recognizes more things like pragmas, preprocessors, modules, containers, FFIs etc. Thanks to [Zena Treep][treep] for the implementation and to [Jeremy Hull][sourrust] for guiding it. -- Miscelleanous fixes in PHP, Brainfuck, SCSS, Asciidoc, CMake, Python and F#. +- Miscellaneous fixes in PHP, Brainfuck, SCSS, Asciidoc, CMake, Python and F#. [mehdid]: https://github.com/mehdid [nbraud]: https://github.com/nbraud @@ -156,7 +828,7 @@ changes that happened during the past year. Sorry for taking so long! Along with the changes in code highlight.js has finally got its new home at -<http://highlightjs.org/>, moving from its craddle on Software Maniacs which it +<http://highlightjs.org/>, moving from its cradle on Software Maniacs which it outgrew a long time ago. Be sure to report any bugs about the site to <mailto:in...@hi...>. @@ -395,7 +1067,7 @@ [beta]: http://softwaremaniacs.org/blog/2011/04/25/highlight-js-60-beta/en/ -P.S. New version is not yet available on a Yandex' CDN, so for now you have to +P.S. New version is not yet available on a Yandex CDN, so for now you have to download [your own copy][d]. [d]: /soft/highlight/en/download/ @@ -422,7 +1094,7 @@ - Description of HTML has got new tags from [HTML 5][]. - CSS-styles have been unified to use consistent padding and also have lost pop-outs with names of detected languages. -- [Igor Kalnitsky][ik] has sent two new language descriptions: CMake и VHDL. +- [Igor Kalnitsky][ik] has sent two new language descriptions: CMake & VHDL. This makes total number of languages supported by highlight.js to reach 35. @@ -562,7 +1234,8 @@ ## Version 5.2 -- at last it's possible to replace indentation TABs with something sensible (e.g. 2 or 4 spaces) +- at last it's possible to replace indentation TABs with something sensible + (e.g. 2 or 4 spaces) - new keywords and built-ins for 1C by Sergey Baranov - a couple of small fixes to Apache highlighting Modified: trunk/themes/default/highlight.js/README.md =================================================================== --- trunk/themes/default/highlight.js/README.md 2016-10-14 11:00:13 UTC (rev 9970) +++ trunk/themes/default/highlight.js/README.md 2016-10-14 15:39:20 UTC (rev 9971) @@ -1,167 +1,150 @@ # Highlight.js -Highlight.js highlights syntax in code examples on blogs, forums and, -in fact, on any web page. It's very easy to use because it works -automatically: finds blocks of code, detects a language, highlights it. +[![Build Status](https://travis-ci.org/isagalaev/highlight.js.svg?branch=master)](https://travis-ci.org/isagalaev/highlight.js) -Autodetection can be fine tuned when it fails by itself (see "Heuristics"). +Highlight.js is a syntax highlighter written in JavaScript. It works in +the browser as well as on the server. It works with pretty much any +markup, doesn’t depend on any framework and has automatic language +detection. +## Getting Started -## Basic usage +The bare minimum for using highlight.js on a web page is linking to the +library along with one of the styles and calling +[`initHighlightingOnLoad`][1]: -Link the library and a stylesheet from your page and hook highlighting to -the page load event: - ```html -<link rel="stylesheet" href="styles/default.css"> -<script src="highlight.pack.js"></script> +<link rel="stylesheet" href="/path/to/styles/default.css"> +<script src="/path/to/highlight.pack.js"></script> <script>hljs.initHighlightingOnLoad();</script> ``` -This will highlight all code on the page marked up as `<pre><code> .. </code></pre>`. -If you use different markup or need to apply highlighting dynamically, read -"Custom initialization" below. +This will find and highlight code inside of `<pre><code>` tags; it tries +to detect the language automatically. If automatic detection doesn’t +work for you, you can specify the language in the `class` attribute: -- You can download your own customized version of "highlight.pack.js" or - use the hosted one as described on the download page: - <http://highlightjs.org/download/> +```html +<pre><code class="html">...</code></pre> +``` -- Style themes are available in the download package or as hosted files. - To create a custom style for your site see the class reference in the file - [CSS classes reference][cr] from the downloaded package. +The list of supported language classes is available in the [class +reference][2]. Classes can also be prefixed with either `language-` or +`lang-`. -[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html +To disable highlighting altogether use the `nohighlight` class: +```html +<pre><code class="nohighlight">...</code></pre> +``` -## node.js +## Custom Initialization -Highlight.js can be used under node.js. The package with all supported languages is -installable from NPM: +When you need a bit more control over the initialization of +highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4] +functions. This allows you to control *what* to highlight and *when*. - npm install highlight.js +Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using +jQuery: -Alternatively, you can build it from the source with only languages you need: - - python3 tools/build.py -tnode lang1 lang2 .. - -Using the library: - ```javascript -var hljs = require('highlight.js'); - -// If you know the language -hljs.highlight(lang, code).value; - -// Automatic language detection -hljs.highlightAuto(code).value; +$(document).ready(function() { + $('pre code').each(function(i, block) { + hljs.highlightBlock(block); + }); +}); ``` +You can use any tags instead of `<pre><code>` to mark up your code. If +you don't use a container that preserve line breaks you will need to +configure highlight.js to use the `<br>` tag: -## AMD - -Highlight.js can be used with an AMD loader. You will need to build it from -source in order to do so: - -```bash -$ python3 tools/build.py -tamd lang1 lang2 .. -``` - -Which will generate a `build/highlight.pack.js` which will load as an AMD -module with support for the built languages and can be used like so: - ```javascript -require(["highlight.js/build/highlight.pack"], function(hljs){ +hljs.configure({useBR: true}); - // If you know the language - hljs.highlight(lang, code).value; - - // Automatic language detection - hljs.highlightAuto(code).value; +$('div.code').each(function(i, block) { + hljs.highlightBlock(block); }); ``` +For other options refer to the documentation for [`configure`][4]. -## Tab replacement -You can replace TAB ('\x09') characters used for indentation in your code -with some fixed number of spaces or with a `<span>` to give them special -styling: +## Web Workers -```html -<script type="text/javascript"> - hljs.configure({tabReplace: ' '}); // 4 spaces - // ... or - hljs.configure({tabReplace: '<span class="indent">\t</span>'}); +You can run highlighting inside a web worker to avoid freezing the browser +window while dealing with very big chunks of code. - hljs.initHighlightingOnLoad(); -</script> -``` +In your main script: -## Custom initialization - -If you use different markup for code blocks you can initialize them manually -with `highlightBlock(code)` function. It takes a DOM element containing the -code to highlight and optionally a string with which to replace TAB -characters. - -Initialization using, for example, jQuery might look like this: - ```javascript -$(document).ready(function() { - $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); -}); +addEventListener('load', function() { + var code = document.querySelector('#code'); + var worker = new Worker('worker.js'); + worker.onmessage = function(event) { code.innerHTML = event.data; } + worker.postMessage(code.textContent); +}) ``` -You can use `highlightBlock` to highlight blocks dynamically inserted into -the page. Just make sure you don't do it twice for already highlighted -blocks. +In worker.js: -If your code container relies on `<br>` tags instead of line breaks (i.e. if -it's not `<pre>`) set the `useBR` option to `true`: - ```javascript -hljs.configure({useBR: true}); -$('div.code').each(function(i, e) {hljs.highlightBlock(e)}); +onmessage = function(event) { + importScripts('<path>/highlight.pack.js'); + var result = self.hljs.highlightAuto(event.data); + postMessage(result.value); +} ``` -## Heuristics +## Getting the Library -Autodetection of a code's language is done using a simple heuristic: -the program tries to highlight a fragment with all available languages and -counts all syntactic structures that it finds along the way. The language -with greatest count wins. +You can get highlight.js as a hosted, or custom-build, browser script or +as a server module. Right out of the box the browser script supports +both AMD and CommonJS, so if you wish you can use RequireJS or +Browserify without having to build from source. The server module also +works perfectly fine with Browserify, but there is the option to use a +build specific to browsers rather than something meant for a server. +Head over to the [download page][5] for all the options. -This means that in short fragments the probability of an error is high -(and it really happens sometimes). In this cases you can set the fragment's -language explicitly by assigning a class to the `<code>` element: +**Don't link to GitHub directly.** The library is not supposed to work straight +from the source, it requires building. If none of the pre-packaged options +work for you refer to the [building documentation][6]. +**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be +too big. If you don't see the language you need in the ["Common" section][5], +it can be added manually: + ```html -<pre><code class="html">...</code></pre> +<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script> ``` -You can use class names recommended in HTML5: "language-html", -"language-php". Classes also can be assigned to the `<pre>` element. +**On Almond.** You need to use the optimizer to give the module a name. For +example: -To disable highlighting of a fragment altogether use "no-highlight" class: - -```html -<pre><code class="no-highlight">...</code></pre> ``` +r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js +``` -## Export +## License -File export.html contains a little program that allows you to paste in a code -snippet and then copy and paste the resulting HTML code generated by the -highlighter. This is useful in situations when you can't use the script itself -on a site. +Highlight.js is released under the BSD License. See [LICENSE][7] file +for details. +## Links -## Meta +The official site for the library is at <https://highlightjs.org/>. -- Version: 8.0 -- URL: http://highlightjs.org/ +Further in-depth documentation for the API and other topics is at +<http://highlightjs.readthedocs.io/>. -For the license terms see LICENSE files. -For authors and contributors see AUTHORS.en.txt file. +Authors and contributors are listed in the [AUTHORS.en.txt][8] file. + +[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload +[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html +[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block +[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options +[5]: https://highlightjs.org/download/ +[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html +[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE +[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt Modified: trunk/themes/default/highlight.js/README.ru.md =================================================================== --- trunk/themes/default/highlight.js/README.ru.md 2016-10-14 11:00:13 UTC (rev 9970) +++ trunk/themes/default/highlight.js/README.ru.md 2016-10-14 15:39:20 UTC (rev 9971) @@ -1,171 +1,142 @@ # Highlight.js -Highlight.js нужен для подсветки синтаксиса в примерах кода в блогах, -форумах и вообще на любых веб-страницах. Пользоваться им очень просто, -потому что работает он автоматически: сам находит блоки кода, сам -определяет язык, сам подсвечивает. +Highlight.js — это инструмент для подсветки синтаксиса, написанный на JavaScript. Он работает +и в браузере, и на сервере. Он работает с практически любой HTML разметкой, не +зависит от каких-либо фреймворков и умеет автоматически определять язык. -Автоопределением языка можно управлять, когда оно не справляется само (см. -дальше "Эвристика"). +## Начало работы -## Простое использование +Минимум, что нужно сделать для использования highlight.js на веб-странице — это +подключить библиотеку, CSS-стили и вызывать [`initHighlightingOnLoad`][1]: -Подключите библиотеку и стиль на страницу и повесть вызов подсветки на -загрузку страницы: - ```html -<link rel="stylesheet" href="styles/default.css"> -<script src="highlight.pack.js"></script> +<link rel="stylesheet" href="/path/to/styles/default.css"> +<script src="/path/to/highlight.pack.js"></script> <script>hljs.initHighlightingOnLoad();</script> ``` -Весь код на странице, обрамлённый в теги `<pre><code> .. </code></pre>` -будет автоматически подсвечен. Если вы используете другие теги или хотите -подсвечивать блоки кода динамически, читайте "Инициализацию вручную" ниже. +Библиотека найдёт и раскрасит код внутри тегов `<pre><code>`, попытавшись +автоматически определить язык. Когда автоопределение не срабатывает, можно явно +указать язык в атрибуте class: -- Вы можете скачать собственную версию "highlight.pack.js" или сослаться - на захостенный файл, как описано на странице загрузки: - <http://highlightjs.org/download/> +```html +<pre><code class="html">...</code></pre> +``` -- Стилевые темы можно найти в загруженном архиве или также использовать - захостенные. Чтобы сделать собственный стиль для своего сайта, вам - будет полезен [CSS classes reference][cr], который тоже есть в архиве. +Список поддерживаемых классов языков доступен в [справочнике по классам][2]. +Класс также можно предварить префиксами `language-` или `lang-`. -[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html +Чтобы отключить подсветку для какого-то блока, используйте класс `nohighlight`: +```html +<pre><code class="nohighlight">...</code></pre> +``` -## node.js +## Инициализация вручную -Highlight.js можно использовать в node.js. Библиотеку со всеми возможными языками можно -установить с NPM: +Чтобы иметь чуть больше контроля за инициализацией подсветки, вы можете +использовать функции [`highlightBlock`][3] и [`configure`][4]. Таким образом +можно управлять тем, *что* и *когда* подсвечивать. - npm install highlight.js +Вот пример инициализации, эквивалентной вызову [`initHighlightingOnLoad`][1], но +с использованием jQuery: -Также её можно собрать из исходников с только теми языками, которые нужны: - - python3 tools/build.py -tnode lang1 lang2 .. - -Использование библиотеки: - ```javascript -var hljs = require('highlight.js'); - -// Если вы знаете язык -hljs.highlight(lang, code).value; - -// Автоопределение языка -hljs.highlightAuto(code).value; +$(document).ready(function() { + $('pre code').each(function(i, block) { + hljs.highlightBlock(block); + }); +}); ``` +Вы можете использовать любые теги разметки вместо `<pre><code>`. Если +используете контейнер, не сохраняющий переводы строк, вам нужно сказать +highlight.js использовать для них тег `<br>`: -## AMD - -Highlight.js можно использовать с загрузчиком AMD-модулей. Для этого его -нужно собрать из исходников следующей командой: - -```bash -$ python3 tools/build.py -tamd lang1 lang2 .. -``` - -Она создаст файл `build/highlight.pack.js`, который является загружаемым -AMD-модулем и содержит все выбранные при сборке языки. Используется он так: - ```javascript -require(["highlight.js/build/highlight.pack"], function(hljs){ +hljs.configure({useBR: true}); - // Если вы знаете язык - hljs.highlight(lang, code).value; - - // Автоопределение языка - hljs.highlightAuto(code).value; +$('div.code').each(function(i, block) { + hljs.highlightBlock(block); }); ``` +Другие опции можно найти в документации функции [`configure`][4]. -## Замена TABов -Также вы можете заменить символы TAB ('\x09'), используемые для отступов, на -фиксированное количество пробелов или на отдельный `<span>`, чтобы задать ему -какой-нибудь специальный стиль: +## Web Workers -```html -<script type="text/javascript"> - hljs.configure({tabReplace: ' '}); // 4 spaces - // ... or - hljs.configure({tabReplace: '<span class="indent">\t</span>'}); +Подсветку можно запустить внутри web worker'а, чтобы окно +браузера не подтормаживало при работе с большими кусками кода. - hljs.initHighlightingOnLoad(); -</script> -``` +В основном скрипте: - -## Инициализация вручную - -Если вы используете другие теги для блоков кода, вы можете инициализировать их -явно с помощью функции `highlightBlock(code)`. Она принимает DOM-элемент с -текстом расцвечиваемого кода и опционально - строчку для замены символов TAB. - -Например с использованием jQuery код инициализации может выглядеть так: - ```javascript -$(document).ready(function() { - $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); -}); +addEventListener('load', function() { + var code = document.querySelector('#code'); + var worker = new Worker('worker.js'); + worker.onmessage = function(event) { code.innerHTML = event.data; } + worker.postMessage(code.textContent); +}) ``` -`highlightBlock` можно также использовать, чтобы подсветить блоки кода, -добавленные на страницу динамически. Только убедитесь, что вы не делаете этого -повторно для уже раскрашенных блоков. +В worker.js: -Если ваш блок кода использует `<br>` вместо переводов строки (т.е. если это не -`<pre>`), включите опцию `useBR`: - ```javascript -hljs.configure({useBR: true}); -$('div.code').each(function(i, e) {hljs.highlightBlock(e)}); +onmessage = function(event) { + importScripts('<path>/highlight.pack.js'); + var result = self.hljs.highlightAuto(event.data); + postMessage(result.value); +} ``` -## Эвристика +## Установка библиотеки -Определение языка, на котором написан фрагмент, делается с помощью -довольно простой эвристики: программа пытается расцветить фрагмент всеми -языками подряд, и для каждого языка считает количество подошедших -синтаксически конструкций и ключевых слов. Для какого языка нашлось больше, -тот и выбирается. +Highlight.js можно использовать в браузере прямо с CDN хостинга или скачать +индивидуальную сборку, а также установив модуль на сервере. На +[странице загрузки][5] подробно описаны все варианты. -Это означает, что в коротких фрагментах высока вероятность ошибки, что -периодически и случается. Чтобы указать язык фрагмента явно, надо написать -его название в виде класса к элементу `<code>`: +**Не подключайте GitHub напрямую.** Библиотека не предназначена для +использования в виде исходного кода, а требует отдельной сборки. Если вам не +подходит ни один из готовых вариантов, читайте [документацию по сборке][6]. +**Файл на CDN содержит не все языки.** Иначе он будет слишком большого размера. +Если нужного вам языка нет в [категории "Common"][5], можно дообавить его +вручную: + ```html -<pre><code class="html">...</code></pre> +<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script> ``` -Можно использовать рекомендованные в HTML5 названия классов: -"language-html", "language-php". Также можно назначать классы на элемент -`<pre>`. +**Про Almond.** Нужно задать имя модуля в оптимизаторе, например: -Чтобы запретить расцветку фрагмента вообще, используется класс "no-highlight": - -```html -<pre><code class="no-highlight">...</code></pre> ``` +r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js +``` -## Экспорт +## Лицензия -В файле export.html находится небольшая программка, которая показывает и дает -скопировать непосредственно HTML-код подсветки для любого заданного фрагмента кода. -Это может понадобится например на сайте, на котором нельзя подключить сам скрипт -highlight.js. +Highlight.js распространяется под лицензией BSD. Подробнее читайте файл +[LICENSE][7]. -## Координаты +## Ссылки -- Версия: 8.0 -- URL: http://highlightjs.org/ +Официальный сайт билиотеки расположен по адресу <https://highlightjs.org/>. -Лицензионное соглашение читайте в файле LICENSE. -Список авторов и соавторов читайте в файле AUTHORS.ru.txt +Более подробная документация по API и другим темам расположена на +<http://highlightjs.readthedocs.io/>. + +Авторы и контрибьюторы перечислены в файле [AUTHORS.ru.txt][8] file. + +[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload +[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html +[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block +[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options +[5]: https://highlightjs.org/download/ +[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html +[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE +[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.ru.txt Modified: trunk/themes/default/highlight.js/highlight.pack.js =================================================================== --- trunk/themes/default/highlight.js/highlight.pack.js 2016-10-14 11:00:13 UTC (rev 9970) +++ trunk/themes/default/highlight.js/highlight.pack.js 2016-10-14 15:39:20 UTC (rev 9971) @@ -1 +1,2 @@ -var hljs=new function(){function k(v){return v.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function t(v){return v.nodeName.toLowerCase()}function i(w,x){var v=w&&w.exec(x);return v&&v.index==0}function d(v){return Array.prototype.map.call(v.childNodes,function(w){if(w.nodeType==3){return b.useBR?w.nodeValue.replace(/\n/g,""):w.nodeValue}if(t(w)=="br"){return"\n"}return d(w)}).join("")}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^language-/,"")});return v.filter(function(x){return j(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset<y[0].offset)?w:y}return y[0].event=="start"?w:y}function A(H){function G(I){return" "+I.nodeName+'="'+k(I.value)+'"'}F+="<"+t(H)+Array.prototype.map.call(H.attributes,G).join("")+">"}function E(G){F+="</"+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=k(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+k(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};function E(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})}if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b=D.bK.split(" ").join("|")}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?\\b("+F.b+")\\b\\.?":F.b}).concat([D.tE]).concat([D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T<V.c.length;T++){if(i(V.c[T].bR,U)){return V.c[T]}}}function z(U,T){if(i(U.eR,T)){return U}if(U.eW){return z(U.parent,T)}}function A(T,U){return !J&&i(U.iR,T)}function E(V,T){var U=M.cI?T[0].toLowerCase():T[0];return V.k.hasOwnProperty(U)&&V.k[U]}function w(Z,X,W,V){var T=V?"":b.classPrefix,U='<span class="'+T,Y=W?"":"</span>";U+=Z+'">';return U+X+Y}function N(){var U=k(C);if(!I.k){return U}var T="";var X=0;I.lR.lastIndex=0;var V=I.lR.exec(U);while(V){T+=U.substr(X,V.index-X);var W=E(I,V);if(W){H+=W[1];T+=w(W[0],V[0])}else{T+=V[0]}X=I.lR.lastIndex;V=I.lR.exec(U)}return T+U.substr(X)}function F(){if(I.sL&&!f[I.sL]){return k(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):g(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=k(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+="</span>"}H+=I.r;I=I.parent}while(I!=W.parent);if(U.eE){D+=k(X)}C="";if(W.starts){P(W.starts,"")}return U.rE?0:X.length}if(A(X,I)){throw new Error('Illegal lexeme "'+X+'" for mode "'+(I.cN||"<unnamed>")+'"')}C+=X;return X.length||1}var M=j(S);if(!M){throw new Error('Unknown language: "'+S+'"')}m(M);var I=R||M;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D=w(K.cN,D,true)}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+="</span>"}}return{r:H,value:D,language:S,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:k(L)}}else{throw O}}}function g(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:k(y)};var w=v;x.forEach(function(z){if(!j(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function h(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"<br>")}return v}function p(z){var y=d(z);var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):g(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=h(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function e(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function j(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=g;this.fixMarkup=h;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=e;this.getLanguage=j;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b... [truncated message content] |
From: <var...@us...> - 2016-11-25 13:11:39
|
Revision: 9976 http://sourceforge.net/p/phpwiki/code/9976 Author: vargenau Date: 2016-11-25 13:11:36 +0000 (Fri, 25 Nov 2016) Log Message: ----------- Translate one more message Modified Paths: -------------- trunk/lib/loadsave.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 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/lib/loadsave.php 2016-11-25 13:11:36 UTC (rev 9976) @@ -1077,7 +1077,7 @@ // noreturn } if (!$request->getArg('verify')) { - $mesg->pushContent(HTML::p(fmt("Are you sure to revert %s to version $version?", WikiLink($pagename))), + $mesg->pushContent(HTML::p(fmt("Are you sure to revert %s to version %d?", WikiLink($pagename), $version)), HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'), HiddenInputs($request->getArgs(), false, array('verify')), 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 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/de.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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." @@ -671,6 +671,10 @@ msgid "Revert cancelled" msgstr "Zurückspeichern abgebrochen" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "Sind Sie sicher, dass Sie %s zu Version %d zurückspeichern wollen?" + msgid "Yes" msgstr "Ja" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/es.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -654,6 +654,10 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "Si" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/fr.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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." @@ -661,6 +661,10 @@ msgid "Revert cancelled" msgstr "Révocation annulée" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "Êtes-vous certain de vouloir revenir à la version %d de %s ?" + msgid "Yes" msgstr "Oui" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/it.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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" @@ -643,6 +643,10 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "Si" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/ja.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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" @@ -632,15 +632,19 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "" msgid "Cancel" msgstr "" -#, fuzzy, php-format +#, php-format msgid "Revert to version %d" -msgstr "バージョン %d" +msgstr "" #, php-format msgid "Revert: %s" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/nl.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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" @@ -632,6 +632,10 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/phpwiki.pot 2016-11-25 13:11:36 UTC (rev 9976) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+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" @@ -626,6 +626,10 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/sv.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -627,6 +627,10 @@ msgid "Revert cancelled" msgstr "" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-11-25 11:07:40 UTC (rev 9975) +++ trunk/locale/po/zh.po 2016-11-25 13:11:36 UTC (rev 9976) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:13+0200\n" +"POT-Creation-Date: 2016-11-25 14:10+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -657,6 +657,10 @@ msgid "Revert cancelled" msgstr "取消" +#, php-format +msgid "Are you sure to revert %s to version %d?" +msgstr "" + msgid "Yes" 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...> - 2016-12-02 09:36:24
|
Revision: 9980 http://sourceforge.net/p/phpwiki/code/9980 Author: vargenau Date: 2016-12-02 09:36:22 +0000 (Fri, 02 Dec 2016) Log Message: ----------- More translations Modified Paths: -------------- 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/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/lib/upgrade.php 2016-12-02 09:36:22 UTC (rev 9980) @@ -712,7 +712,7 @@ if ($this->db_version < $this->current_db_version) { $this->dbi->set_db_version($this->current_db_version); $this->db_version = $this->dbi->get_db_version(); - echo "db version: upgrade to ", $this->db_version, " "; + echo _("db version: upgrade to "), $this->db_version, " "; echo _("OK"), "<br />\n"; flush(); } 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 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/de.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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." @@ -4740,6 +4740,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/es.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -4617,6 +4617,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/fr.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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." @@ -4697,15 +4697,22 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "Version de la base de données : mise à niveau vers " + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." msgstr "" +"La mise à niveau nécessite les droits CREATE et ALTER de la base de données " +"phpwiki " msgid "" "And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" +"Et pour Windows au moins le droit de SELECT FROM mysql, et éventuellement " +"UPDATE mysql " msgid "DB admin user:" msgstr "Identifiant de l'administrateur de la base de données :" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/it.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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" @@ -4581,6 +4581,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/ja.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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" @@ -4720,6 +4720,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/nl.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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" @@ -4571,6 +4571,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/phpwiki.pot 2016-12-02 09:36:22 UTC (rev 9980) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+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" @@ -4563,6 +4563,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/sv.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -4564,6 +4564,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-01 15:10:50 UTC (rev 9979) +++ trunk/locale/po/zh.po 2016-12-02 09:36:22 UTC (rev 9980) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-01 16:07+0100\n" +"POT-Creation-Date: 2016-12-02 10:34+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -4801,6 +4801,9 @@ msgid "FIXING" msgstr "" +msgid "db version: upgrade to " +msgstr "" + msgid "" "Upgrade requires database privileges to CREATE and ALTER the phpwiki " "database." 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...> - 2016-12-05 12:46:42
|
Revision: 9981 http://sourceforge.net/p/phpwiki/code/9981 Author: vargenau Date: 2016-12-05 12:46:40 +0000 (Mon, 05 Dec 2016) Log Message: ----------- Wiki upgrade: do not ask for login/password Modified Paths: -------------- 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/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/lib/upgrade.php 2016-12-05 12:46:40 UTC (rev 9981) @@ -412,13 +412,6 @@ _("database")), " - ", DATABASE_TYPE, "</h2>\n"; $dbadmin = $this->request->getArg('dbadmin'); - if ($this->isSQL) { - $this->_db_init(); - if (isset($dbadmin['cancel'])) { - echo _("Cancel"), " <br />\n"; - return; - } - } 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) { @@ -719,113 +712,6 @@ } /** - * Filter SQL missing permissions errors. - * - * A wrong DBADMIN user will not be able to connect - * @see _is_false_error, ErrorManager - */ - public function _dbpermission_filter($err) - { - if ($err->isWarning()) { - global $ErrorManager; - $this->error_caught = 1; - $ErrorManager->_postponed_errors[] = $err; - return true; - } - return false; - } - - private function _try_dbadmin_user($user, $passwd) - { - global $DBParams; - $AdminParams = $DBParams; - if (DATABASE_TYPE == 'SQL') - $dsn = DB::parseDSN($AdminParams['dsn']); - else { - $dsn = parseDSN($AdminParams['dsn']); - } - $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s", - $dsn['phptype'], - $user, - $passwd, - $dsn['hostspec'], - $dsn['database']); - $AdminParams['_tryroot_from_upgrade'] = 1; - // add error handler to warn about missing permissions for DBADMIN_USER - global $ErrorManager; - $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter')); - $this->error_caught = 0; - $this->dbi = WikiDB::open($AdminParams); - if (!$this->error_caught) - return true; - // FAILED: redo our connection with the wikiuser - $this->dbi = WikiDB::open($DBParams); - $ErrorManager->flushPostponedErrors(); - $ErrorManager->popErrorHandler(); - return false; - } - - private function _db_init() - { - if (!$this->isSQL) - return; - - /* SQLite never needs admin params */ - $backend_type = $this->dbi->_backend->backendType(); - if (substr($backend_type, 0, 6) == "sqlite") { - return; - } - $dbadmin_user = 'root'; - if ($dbadmin = $this->request->getArg('dbadmin')) { - $dbadmin_user = $dbadmin['user']; - if (isset($dbadmin['cancel'])) { - return; - } elseif (!empty($dbadmin_user)) { - if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd'])) - return; - } - } elseif (DBADMIN_USER) { - if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD)) { - return; - } - } - // Check if the privileges are enough. Need CREATE and ALTER perms. - // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql. - $form = HTML::form(array("method" => "post", - "action" => $this->request->getPostURL(), - "accept-charset" => 'UTF-8'), - HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."), - HTML::br(), - _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")), - HiddenInputs(array('action' => 'upgrade', - 'overwrite' => $this->request->getArg('overwrite'))), - HTML::table(array("cellspacing" => 4), - HTML::tr(HTML::td(array('align' => 'right'), - _("DB admin user:")), - HTML::td(HTML::input(array('name' => "dbadmin[user]", - 'size' => 12, - 'maxlength' => 256, - 'value' => $dbadmin_user)))), - HTML::tr(HTML::td(array('align' => 'right'), - _("DB admin password:")), - HTML::td(HTML::input(array('name' => "dbadmin[passwd]", - 'type' => 'password', - 'size' => 12, - 'maxlength' => 256)))), - HTML::tr(HTML::td(array('align' => 'center', 'colspan' => 2), - Button("submit:", _("Submit"), 'wikiaction'), - HTML::raw(' '), - Button("submit:dbadmin[cancel]", _("Cancel"), - 'button'))))); - $form->printXML(); - echo "</div><!-- content -->\n"; - echo AsXML(Template("bottom")); - echo "</body></html>\n"; - $this->request->finish(); - exit(); - } - - /** * if page.cached_html does not exists: * put _cached_html from pagedata into a new separate blob, * not into the huge serialized string. 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 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/de.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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." @@ -4743,22 +4743,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "DB Admin Benutzername:" - -msgid "DB admin password:" -msgstr "DB Admin passwort:" - msgid "Check for extra page.cached_html column" msgstr "" @@ -6039,6 +6023,12 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "DB admin user:" +#~ msgstr "DB Admin Benutzername:" + +#~ msgid "DB admin password:" +#~ msgstr "DB Admin passwort:" + #~ msgid "Help/TextFormattingRules" #~ msgstr "Hilfe/TextFormatierungsRegeln" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/es.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -4620,22 +4620,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "DB admin username:" - -msgid "DB admin password:" -msgstr "DB admin contraseña:" - msgid "Check for extra page.cached_html column" msgstr "" @@ -5867,6 +5851,12 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "DB admin user:" +#~ msgstr "DB admin username:" + +#~ msgid "DB admin password:" +#~ msgstr "DB admin contraseña:" + #~ msgid "Help/TextFormattingRules" #~ msgstr "Ayuda/ReglasDeFormatoDeTexto" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/fr.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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." @@ -4700,26 +4700,6 @@ msgid "db version: upgrade to " msgstr "Version de la base de données : mise à niveau vers " -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" -"La mise à niveau nécessite les droits CREATE et ALTER de la base de données " -"phpwiki " - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" -"Et pour Windows au moins le droit de SELECT FROM mysql, et éventuellement " -"UPDATE mysql " - -msgid "DB admin user:" -msgstr "Identifiant de l'administrateur de la base de données :" - -msgid "DB admin password:" -msgstr "Mot de passe de l'administrateur de la base de données :" - msgid "Check for extra page.cached_html column" msgstr "Recherche une colonne supplémentaire page.cached_html" @@ -5973,6 +5953,26 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "" +#~ "Upgrade requires database privileges to CREATE and ALTER the phpwiki " +#~ "database." +#~ msgstr "" +#~ "La mise à niveau nécessite les droits CREATE et ALTER de la base de " +#~ "données phpwiki " + +#~ msgid "" +#~ "And on Windows at least the privilege to SELECT FROM mysql, and possibly " +#~ "UPDATE mysql" +#~ msgstr "" +#~ "Et pour Windows au moins le droit de SELECT FROM mysql, et éventuellement " +#~ "UPDATE mysql " + +#~ msgid "DB admin user:" +#~ msgstr "Identifiant de l'administrateur de la base de données :" + +#~ msgid "DB admin password:" +#~ msgstr "Mot de passe de l'administrateur de la base de données :" + #~ msgid "Invalid path: No access" #~ msgstr "Chemin non valable : accès refusé" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/it.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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" @@ -4584,22 +4584,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -msgid "DB admin password:" -msgstr "" - msgid "Check for extra page.cached_html column" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/ja.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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" @@ -4723,22 +4723,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -msgid "DB admin password:" -msgstr "" - msgid "Check for extra page.cached_html column" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/nl.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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" @@ -4574,22 +4574,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -msgid "DB admin password:" -msgstr "" - msgid "Check for extra page.cached_html column" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/phpwiki.pot 2016-12-05 12:46:40 UTC (rev 9981) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+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" @@ -4566,22 +4566,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -msgid "DB admin password:" -msgstr "" - msgid "Check for extra page.cached_html column" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/sv.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -4567,22 +4567,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -msgid "DB admin password:" -msgstr "" - msgid "Check for extra page.cached_html column" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-02 09:36:22 UTC (rev 9980) +++ trunk/locale/po/zh.po 2016-12-05 12:46:40 UTC (rev 9981) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-02 10:34+0100\n" +"POT-Creation-Date: 2016-12-05 13:42+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -4804,23 +4804,6 @@ msgid "db version: upgrade to " msgstr "" -msgid "" -"Upgrade requires database privileges to CREATE and ALTER the phpwiki " -"database." -msgstr "" - -msgid "" -"And on Windows at least the privilege to SELECT FROM mysql, and possibly " -"UPDATE mysql" -msgstr "" - -msgid "DB admin user:" -msgstr "" - -#, fuzzy -msgid "DB admin password:" -msgstr "改變密碼:" - msgid "Check for extra page.cached_html column" 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...> - 2016-12-05 13:38:16
|
Revision: 9983 http://sourceforge.net/p/phpwiki/code/9983 Author: vargenau Date: 2016-12-05 13:38:13 +0000 (Mon, 05 Dec 2016) Log Message: ----------- Add "..." to be consistent Modified Paths: -------------- 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/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/lib/upgrade.php 2016-12-05 13:38:13 UTC (rev 9983) @@ -76,7 +76,7 @@ or ($pagename == _("HomePage")) or ($pagename == "HomePage") ) { - echo "$path/$pagename: " . _("always skip the HomePage.") . " " . _("Skipped."), "<br />\n"; + echo "$path/$pagename: " . _("always skip the HomePage") . " ... " . _("Skipped."), "<br />\n"; return; } @@ -101,16 +101,16 @@ if (!$new_mtime) $new_mtime = $stat[9]; if ($new_mtime > $page_mtime) { - echo "$path/$pagename" . _(": ") . _("newer than the existing page.") - . " " . _("Replace") . " " . "($new_mtime > $page_mtime)" . "<br />\n"; + echo "$path/$pagename" . _(": ") . _("newer than the existing page") + . " ... " . _("Replace") . " " . "($new_mtime > $page_mtime)" . "<br />\n"; LoadAny($this->request, $path . "/" . $filename); echo "<br />\n"; } else { - echo "$path/$pagename" . _(": ") . _("older than the existing page.") - . " " . _("Skipped."), "<br />\n"; + echo "$path/$pagename" . _(": ") . _("older than the existing page") + . " ... " . _("Skipped."), "<br />\n"; } } else { - echo "$path/$pagename" . _(": ") . _("unknown format.") . " " . _("Skipped.") . "<br />\n"; + echo "$path/$pagename" . _(": ") . _("unknown format") . " ... " . _("Skipped.") . "<br />\n"; } } else { echo sprintf(_("%s does not exist"), $pagename), "<br />\n"; @@ -202,7 +202,7 @@ $this->_rename_to_help_page($pagename); } if (in_array($pagename, $themepgsrc)) { - echo sprintf(_('%s already checked in theme pgsrc.'), $pagename).' '._('Skipped.').'<br />'; + echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped.').'<br />'; } else { $this->doPgsrcUpdate($pagename, $path, $filename); } @@ -1010,7 +1010,7 @@ { // not applicable if (isset($this->silent_skip)) return true; - echo " " . _("Skipped.") . "<br />\n"; + echo " ... " . _("Skipped.") . "<br />\n"; flush(); return true; } 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 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/de.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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." @@ -4630,16 +4630,16 @@ msgid "HomePage" msgstr "StartSeite" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." -msgstr "neuer als die bestehende Seite." +msgid "newer than the existing page" +msgstr "neuer als die bestehende Seite" -msgid "older than the existing page." -msgstr "älter als die bestehende Seite." +msgid "older than the existing page" +msgstr "älter als die bestehende Seite" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4661,7 +4661,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/es.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -4507,16 +4507,16 @@ msgid "HomePage" msgstr "PáginaPrincipal" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4538,7 +4538,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/fr.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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." @@ -4587,17 +4587,17 @@ msgid "HomePage" msgstr "PageAccueil" -msgid "always skip the HomePage." -msgstr "toujours ignorer la page d'accueil." +msgid "always skip the HomePage" +msgstr "toujours ignorer la page d'accueil" -msgid "newer than the existing page." -msgstr "plus récent que la page existante." +msgid "newer than the existing page" +msgstr "plus récent que la page existante" -msgid "older than the existing page." -msgstr "plus vieux que la page existante." +msgid "older than the existing page" +msgstr "plus vieux que la page existante" -msgid "unknown format." -msgstr "format inconnu." +msgid "unknown format" +msgstr "format inconnu" #, php-format msgid "%s does not exist" @@ -4618,8 +4618,8 @@ msgstr "renommer les pages d'aide" #, php-format -msgid "%s already checked in theme pgsrc." -msgstr "%s déjà vérifié dans le pgsrc du thème." +msgid "%s already checked in theme pgsrc" +msgstr "%s déjà vérifié dans le pgsrc du thème" #, php-format msgid "rename %s to %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/it.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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" @@ -4471,16 +4471,16 @@ msgid "HomePage" msgstr "PaginaPrincipale" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4502,7 +4502,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/ja.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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" @@ -4608,16 +4608,16 @@ msgid "HomePage" msgstr "ホームページ" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4640,7 +4640,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, fuzzy, php-format Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/nl.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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" @@ -4461,16 +4461,16 @@ msgid "HomePage" msgstr "ThuisPagina" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4492,7 +4492,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/phpwiki.pot 2016-12-05 13:38:13 UTC (rev 9983) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+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" @@ -4453,16 +4453,16 @@ msgid "HomePage" msgstr "" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4484,7 +4484,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/sv.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -4454,16 +4454,16 @@ msgid "HomePage" msgstr "Framsida" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, php-format @@ -4485,7 +4485,7 @@ msgstr "" #, php-format -msgid "%s already checked in theme pgsrc." +msgid "%s already checked in theme pgsrc" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-05 13:20:05 UTC (rev 9982) +++ trunk/locale/po/zh.po 2016-12-05 13:38:13 UTC (rev 9983) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 13:42+0100\n" +"POT-Creation-Date: 2016-12-05 14:34+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -3412,9 +3412,9 @@ msgid "really" msgstr "" -#, fuzzy, php-format +#, php-format msgid "The page %s is already watched!" -msgstr "此頁面已經存在" +msgstr "" msgid "Edit" msgstr "編輯" @@ -3627,9 +3627,9 @@ msgid "Cannot rename. New page name too long." msgstr "" -#, fuzzy, php-format +#, php-format msgid "Page “%s” already exists. Ignored." -msgstr "%s 已經存在." +msgstr "" #, php-format msgid "Access denied to rename page “%s”." @@ -4687,16 +4687,16 @@ msgid "HomePage" msgstr "首頁" -msgid "always skip the HomePage." +msgid "always skip the HomePage" msgstr "" -msgid "newer than the existing page." +msgid "newer than the existing page" msgstr "" -msgid "older than the existing page." +msgid "older than the existing page" msgstr "" -msgid "unknown format." +msgid "unknown format" msgstr "" #, fuzzy, php-format @@ -4718,9 +4718,9 @@ msgid "rename to Help: pages" msgstr "" -#, php-format -msgid "%s already checked in theme pgsrc." -msgstr "" +#, fuzzy, php-format +msgid "%s already checked in theme pgsrc" +msgstr "%" #, fuzzy, php-format msgid "rename %s to %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...> - 2016-12-05 15:15:09
|
Revision: 9985 http://sourceforge.net/p/phpwiki/code/9985 Author: vargenau Date: 2016-12-05 15:15:07 +0000 (Mon, 05 Dec 2016) Log Message: ----------- No need to display internal time; less strings Modified Paths: -------------- trunk/lib/loadsave.php trunk/lib/plugin/SyncWiki.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 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/lib/loadsave.php 2016-12-05 15:15:07 UTC (rev 9985) @@ -340,7 +340,7 @@ flush(); if (in_array($pagename, $excludeList)) { - PrintXML(_("Skipped.")); + PrintXML(_("Skipped")); flush(); continue; } @@ -619,7 +619,7 @@ } if (in_array($pagename, $excludeList)) { if (!$silent) { - PrintXML(_("Skipped.")); + PrintXML(_("Skipped")); flush(); } continue; Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/lib/plugin/SyncWiki.php 2016-12-05 15:15:07 UTC (rev 9985) @@ -142,7 +142,7 @@ if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) { // our was deleted after sync, and changed after last sync. $this->_addConflict('delete', $args, $our); - $reaction = (_(" skipped") . " (" . "locally deleted or moved" . ")"); + $reaction = ' ' . _('skipped') . ' (' . _('locally deleted or moved') . ')'; } else { $reaction = $this->_import($args, $our, $extdate); } @@ -195,7 +195,7 @@ while ($our = $ouriter->next()) { $name = $our->getName(); if ($done[$name]) continue; - $reaction = _(" skipped"); + $reaction = ' ' . _('skipped'); $ext = wiki_xmlrpc_post('wiki.getPageInfo', $name, $args['url']); if (is_array($ext)) { $extdate = iso8601_decode($ext['lastModified']->scalar, 1); @@ -230,7 +230,7 @@ $file = substr($path, $len); $ourdate = filemtime($path); $oursize = filesize($path); - $reaction = _(" skipped"); + $reaction = ' ' . _('skipped'); $ext = wiki_xmlrpc_post('wiki.getUploadedFileInfo', $file, $args['url']); if (is_array($ext)) { $extdate = iso8601_decode($ext['lastModified']->scalar, 1); @@ -294,7 +294,9 @@ private function _import($args, $our, $extdate = null) { $reaction = 'import '; - if ($args['noimport']) return ($reaction . _("skipped")); + if ($args['noimport']) { + return ($reaction . _('skipped')); + } //$userid = $request->_user->_userid; $name = $our->getName(); $pagedata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']); @@ -303,7 +305,7 @@ $ourrev = $our->getCurrentRevision(true); $content = $ourrev->getPackedContent(); if ($pagedata == $content) - return $reaction . _("skipped") . ' ' . _("same content"); + return $reaction . _('skipped') . ' ' . _('same content'); if (is_null($extdate)) $extdate = time(); $our->save(utf8_decode($pagedata), -1, array('author' => $userid, @@ -319,7 +321,9 @@ { global $request; $reaction = 'export '; - if ($args['noexport']) return ($reaction . _("skipped")); + if ($args['noexport']) { + return ($reaction . _('skipped')); + } $userid = $request->_user->_userid; $name = $our->getName(); $ourrev = $our->getCurrentRevision(true); @@ -328,7 +332,7 @@ if (is_object($extdata)) { $extdata = $extdata->scalar; if ($extdata == $content) - return $reaction . _("skipped") . ' ' . _("same content"); + return $reaction . _('skipped') . ' ' . _('same content'); } $mypass = $request->getPref('passwd'); // this usually fails $success = wiki_xmlrpc_post('wiki.putPage', @@ -347,7 +351,9 @@ private function _upload($args, $path, $timeout) { $reaction = 'upload '; - if ($args['noupload']) return ($reaction . _("skipped")); + if ($args['noupload']) { + return ($reaction . _('skipped')); + } //$userid = $request->_user->_userid; $url = $args['url']; Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/lib/upgrade.php 2016-12-05 15:15:07 UTC (rev 9985) @@ -76,7 +76,7 @@ or ($pagename == _("HomePage")) or ($pagename == "HomePage") ) { - echo "$path/$pagename: " . _("always skip the HomePage") . " ... " . _("Skipped."), "<br />\n"; + echo "$path/$pagename: " . _("always skip the HomePage") . " ... " . _("Skipped"), "<br />\n"; return; } @@ -102,15 +102,15 @@ $new_mtime = $stat[9]; if ($new_mtime > $page_mtime) { echo "$path/$pagename" . _(": ") . _("newer than the existing page") - . " ... " . _("Replace") . " " . "($new_mtime > $page_mtime)" . "<br />\n"; + . " ... " . _("Replace") . "<br />\n"; LoadAny($this->request, $path . "/" . $filename); echo "<br />\n"; } else { echo "$path/$pagename" . _(": ") . _("older than the existing page") - . " ... " . _("Skipped."), "<br />\n"; + . " ... " . _("Skipped"), "<br />\n"; } } else { - echo "$path/$pagename" . _(": ") . _("unknown format") . " ... " . _("Skipped.") . "<br />\n"; + echo "$path/$pagename" . _(": ") . _("unknown format") . " ... " . _("Skipped") . "<br />\n"; } } else { echo sprintf(_("%s does not exist"), $pagename), "<br />\n"; @@ -202,7 +202,7 @@ $this->_rename_to_help_page($pagename); } if (in_array($pagename, $themepgsrc)) { - echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped.').'<br />'; + echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped').'<br />'; } else { $this->doPgsrcUpdate($pagename, $path, $filename); } @@ -220,7 +220,7 @@ echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n"; } } else { - echo " " . _("Skipped.") . "<br />\n"; + echo " " . _("Skipped") . "<br />\n"; } } @@ -1010,7 +1010,7 @@ { // not applicable if (isset($this->silent_skip)) return true; - echo " ... " . _("Skipped.") . "<br />\n"; + echo " ... " . _("Skipped") . "<br />\n"; flush(); return true; } 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 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/de.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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." @@ -564,8 +564,8 @@ msgid "Dumping Pages" msgstr "Die Seiten werden geschrieben" -msgid "Skipped." -msgstr "Ausgelassen." +msgid "Skipped" +msgstr "Ausgelassen" #, php-format msgid "saved as %s" @@ -2882,9 +2882,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" -msgstr " ausgelassen" +msgid "skipped" +msgstr "ausgelassen" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2910,9 +2913,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "ausgelassen" - msgid "same content" msgstr "gleiche Seiteninalt" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/es.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -553,8 +553,8 @@ msgid "Dumping Pages" msgstr "Descargar Las Páginas" -msgid "Skipped." -msgstr "Saltado." +msgid "Skipped" +msgstr "Saltado" #, php-format msgid "saved as %s" @@ -2805,9 +2805,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2833,9 +2836,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "mismo contenido" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/fr.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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." @@ -561,8 +561,8 @@ msgid "Dumping Pages" msgstr "Récupération des pages" -msgid "Skipped." -msgstr "Ignoré." +msgid "Skipped" +msgstr "Ignoré" #, php-format msgid "saved as %s" @@ -2843,9 +2843,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" -msgstr " ignoré" +msgid "skipped" +msgstr "ignoré" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2871,9 +2874,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "ignoré" - msgid "same content" msgstr "même contenu" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/it.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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" @@ -544,7 +544,7 @@ msgid "Dumping Pages" msgstr "" -msgid "Skipped." +msgid "Skipped" msgstr "" #, php-format @@ -2778,9 +2778,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2806,9 +2809,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/ja.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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" @@ -531,7 +531,7 @@ msgid "Dumping Pages" msgstr "" -msgid "Skipped." +msgid "Skipped" msgstr "" #, php-format @@ -2819,9 +2819,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2847,9 +2850,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/nl.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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" @@ -533,8 +533,8 @@ msgid "Dumping Pages" msgstr "" -msgid "Skipped." -msgstr "Overgeslagen." +msgid "Skipped" +msgstr "Overgeslagen" #, php-format msgid "saved as %s" @@ -2768,9 +2768,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2796,9 +2799,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/phpwiki.pot 2016-12-05 15:15:07 UTC (rev 9985) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+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" @@ -527,7 +527,7 @@ msgid "Dumping Pages" msgstr "" -msgid "Skipped." +msgid "Skipped" msgstr "" #, php-format @@ -2760,9 +2760,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2788,9 +2791,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/sv.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -528,7 +528,7 @@ msgid "Dumping Pages" msgstr "" -msgid "Skipped." +msgid "Skipped" msgstr "" #, php-format @@ -2761,9 +2761,12 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" msgstr "" +msgid "locally deleted or moved" +msgstr "" + msgid "same date" msgstr "" @@ -2789,9 +2792,6 @@ msgid "Postponed %s for %s." msgstr "" -msgid "skipped" -msgstr "" - msgid "same content" msgstr "Samma innehåll" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-05 14:20:31 UTC (rev 9984) +++ trunk/locale/po/zh.po 2016-12-05 15:15:07 UTC (rev 9985) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 14:34+0100\n" +"POT-Creation-Date: 2016-12-05 15:54+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -553,8 +553,8 @@ msgid "Dumping Pages" msgstr "傾印頁面中" -msgid "Skipped." -msgstr "跳過." +msgid "Skipped" +msgstr "跳過" #, php-format msgid "saved as %s" @@ -2885,7 +2885,10 @@ msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..." msgstr "" -msgid " skipped" +msgid "skipped" +msgstr "跳過" + +msgid "locally deleted or moved" msgstr "" msgid "same date" @@ -2914,10 +2917,6 @@ msgstr "遺失了 %s 的 %s." #, fuzzy -msgid "skipped" -msgstr "跳過" - -#, fuzzy msgid "same content" 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...> - 2016-12-05 17:00:51
|
Revision: 9986 http://sourceforge.net/p/phpwiki/code/9986 Author: vargenau Date: 2016-12-05 17:00:48 +0000 (Mon, 05 Dec 2016) Log Message: ----------- Less strings Modified Paths: -------------- 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 trunk/themes/default/templates/login.tmpl trunk/themes/fusionforge/templates/browse.tmpl 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 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/de.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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." @@ -5455,8 +5455,8 @@ msgid "New users may use an empty password." msgstr "Neue Benutzer können auch ohne Passwort einloggen." -msgid "UserId:" -msgstr "Benutzername:" +msgid "UserId" +msgstr "Benutzername" msgid "or" msgstr "" @@ -5575,9 +5575,6 @@ msgid "User preferences for user %s" msgstr "Einstellungen für Benutzer »%s«" -msgid "UserId" -msgstr "Benutzername" - msgid "Auth Level" msgstr "Auth. Ebene" @@ -5766,9 +5763,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "Leider, Version ist nicht in der Datenbank." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/es.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17:43+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -5324,7 +5324,7 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" +msgid "UserId" msgstr "" msgid "or" @@ -5438,9 +5438,6 @@ msgid "User preferences for user %s" msgstr "Preferencias por usuario “%s”" -msgid "UserId" -msgstr "" - msgid "Auth Level" msgstr "" @@ -5617,9 +5614,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "Esta revisión de la página no existe." Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/fr.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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." @@ -5403,8 +5403,8 @@ msgid "New users may use an empty password." msgstr "Les nouveaux utilisateurs devraient utiliser un mot de passe vide." -msgid "UserId:" -msgstr "Identifiant d'utilisateur :" +msgid "UserId" +msgstr "Identifiant d'utilisateur" msgid "or" msgstr "ou" @@ -5518,9 +5518,6 @@ msgid "User preferences for user %s" msgstr "Préférences de l'utilisateur %s" -msgid "UserId" -msgstr "Identifiant d'utilisateur" - msgid "Auth Level" msgstr "Niveau d'autorisation" @@ -5716,9 +5713,6 @@ msgid "Purge" msgstr "Purger" -msgid "Error:" -msgstr "Erreur :" - msgid "This revision of the page does not exist." msgstr "Cette version de la page n'existe pas." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/it.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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" @@ -5268,7 +5268,7 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" +msgid "UserId" msgstr "" msgid "or" @@ -5382,9 +5382,6 @@ msgid "User preferences for user %s" msgstr "Preferenze per l'utente %s" -msgid "UserId" -msgstr "" - msgid "Auth Level" msgstr "" @@ -5561,9 +5558,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/ja.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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" @@ -5432,8 +5432,8 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" -msgstr "ユーザーID:" +msgid "UserId" +msgstr "ユーザーID" msgid "or" msgstr "" @@ -5549,9 +5549,6 @@ msgid "User preferences for user %s" msgstr "" -msgid "UserId" -msgstr "ユーザーID" - msgid "Auth Level" msgstr "認証レベル" @@ -5738,9 +5735,6 @@ msgid "Purge" msgstr "前後" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/nl.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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" @@ -5258,7 +5258,7 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" +msgid "UserId" msgstr "" msgid "or" @@ -5372,9 +5372,6 @@ msgid "User preferences for user %s" msgstr "" -msgid "UserId" -msgstr "" - msgid "Auth Level" msgstr "" @@ -5551,9 +5548,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/phpwiki.pot 2016-12-05 17:00:48 UTC (rev 9986) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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" @@ -5250,7 +5250,7 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" +msgid "UserId" msgstr "" msgid "or" @@ -5364,9 +5364,6 @@ msgid "User preferences for user %s" msgstr "" -msgid "UserId" -msgstr "" - msgid "Auth Level" msgstr "" @@ -5543,9 +5540,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/sv.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17:43+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -5251,8 +5251,8 @@ msgid "New users may use an empty password." msgstr "" -msgid "UserId:" -msgstr "" +msgid "UserId" +msgstr "Namn" msgid "or" msgstr "" @@ -5365,9 +5365,6 @@ msgid "User preferences for user %s" msgstr "" -msgid "UserId" -msgstr "Namn" - msgid "Auth Level" msgstr "" @@ -5544,9 +5541,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/locale/po/zh.po 2016-12-05 17:00:48 UTC (rev 9986) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 15:54+0100\n" +"POT-Creation-Date: 2016-12-05 17: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" @@ -5529,8 +5529,8 @@ msgid "New users may use an empty password." msgstr "新使用者可以使用空白密碼." -msgid "UserId:" -msgstr "帳號:" +msgid "UserId" +msgstr "帳號" msgid "or" msgstr "" @@ -5647,9 +5647,6 @@ msgid "User preferences for user %s" msgstr "使用者 “%s” 的偏好設定:" -msgid "UserId" -msgstr "帳號" - msgid "Auth Level" msgstr "認證層級" @@ -5833,9 +5830,6 @@ msgid "Purge" msgstr "" -msgid "Error:" -msgstr "" - #, fuzzy msgid "This revision of the page does not exist." msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/themes/default/templates/login.tmpl =================================================================== --- trunk/themes/default/templates/login.tmpl 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/themes/default/templates/login.tmpl 2016-12-05 17:00:48 UTC (rev 9986) @@ -68,7 +68,7 @@ <legend><?php echo _("Sign In") ?></legend> <table> <tr> - <td class="align-right"><label for="userid"><?php echo _("UserId:") ?></label></td> + <td class="align-right"><label for="userid"><?php echo _('UserId')._(':') ?></label></td> <td><input id="userid" type="text" name="auth[userid]" size="12" maxlength="256" value="<?php echo $userid?>" tabindex="1" /> <?php if (ENABLE_AUTH_OPENID) { ?> <?php echo _("or")?> <a href="http://openid.net/"><?php echo _("OpenID")._(':') ?></a> <input type="text" id="inp-openid" name="openid_url" size="32" maxlength="256" value="" tabindex="3" /> Modified: trunk/themes/fusionforge/templates/browse.tmpl =================================================================== --- trunk/themes/fusionforge/templates/browse.tmpl 2016-12-05 15:15:07 UTC (rev 9985) +++ trunk/themes/fusionforge/templates/browse.tmpl 2016-12-05 17:00:48 UTC (rev 9986) @@ -4,7 +4,7 @@ ?> <?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?> - <p class="error"><?php echo _("Error:")?> + <p class="error"><?php echo _('Error')._(': ')?> <?php echo _("This revision of the page does not exist.")?> <?php echo Button('browse', _("View the current version."), $page)?> </p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-12-05 17:48:40
|
Revision: 9987 http://sourceforge.net/p/phpwiki/code/9987 Author: vargenau Date: 2016-12-05 17:48:38 +0000 (Mon, 05 Dec 2016) Log Message: ----------- Respect <h*> hierarchy Modified Paths: -------------- 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/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/lib/upgrade.php 2016-12-05 17:48:38 UTC (rev 9987) @@ -181,7 +181,7 @@ echo "<h2>", sprintf(_("Check for necessary %s updates"), "pgsrc"), "</h2>\n"; if ($this->db_version < 1030.12200612) { - echo "<h4>", _("rename to Help: pages"), "</h4>\n"; + echo "<h3>", _("Rename to Help: pages"), "</h3>\n"; } $translation = __("HomePage"); if ($translation == "HomePage") { 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 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/de.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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." @@ -4657,7 +4657,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/es.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -4534,7 +4534,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/fr.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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." @@ -4614,8 +4614,8 @@ msgid "Check for necessary theme %s updates" msgstr "Vérification des mises à jour nécessaires pour le thème %s" -msgid "rename to Help: pages" -msgstr "renommer les pages d'aide" +msgid "Rename to Help: pages" +msgstr "Renommer les pages en Aide:" #, php-format msgid "%s already checked in theme pgsrc" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/it.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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" @@ -4498,7 +4498,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/ja.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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" @@ -807,16 +807,14 @@ msgid "edit this page" msgstr "ページを編集しています。" -#, fuzzy msgid "rename this page" -msgstr "ページを作成しています。" +msgstr "" msgid "revert to a previous version of this page" msgstr "" -#, fuzzy msgid "create this page" -msgstr "ページを作成しています。" +msgstr "" msgid "load files into this wiki" msgstr "" @@ -1103,9 +1101,8 @@ msgid "Remove this page" msgstr "ページ削除" -#, fuzzy msgid "Purge this page" -msgstr "ページを作成しています。" +msgstr "" #, php-format msgid "Unsupported ACL access type %s ignored." @@ -1445,9 +1442,8 @@ msgid "Wk" msgstr "幅" -#, fuzzy msgid "Create a Wiki Category Page." -msgstr "ページを作成しています。" +msgstr "" msgid "Render SVG charts." msgstr "" @@ -1461,16 +1457,14 @@ msgid "Save to File" msgstr "" -#, fuzzy msgid "Create a wiki page by the provided name." -msgstr "ページを作成しています。" +msgstr "" msgid "Cannot create page with empty name!" msgstr "" -#, fuzzy msgid "CreatePage failed" -msgstr "ページを作成しています。" +msgstr "" #, php-format msgid "Do you really want to create the page “%s”?" @@ -1490,9 +1484,8 @@ msgid "%s already exists" msgstr "" -#, fuzzy msgid "Created by CreatePage" -msgstr "ページを作成しています。" +msgstr "" msgid "Create a Table of Contents and automatically link to headers." msgstr "" @@ -2458,9 +2451,8 @@ msgid "comments" msgstr "コメント" -#, fuzzy msgid "created new pages" -msgstr "ページを作成しています。" +msgstr "" #, php-format msgid " for pages changed by %s" @@ -2568,9 +2560,8 @@ msgid "Full changes" msgstr "" -#, fuzzy msgid "Old and new pages" -msgstr "ページを作成しています。" +msgstr "" #, fuzzy msgid "New pages only" @@ -3949,9 +3940,8 @@ msgid "CategoryHomePages" msgstr "" -#, fuzzy msgid "CategoryPage" -msgstr "ページを作成しています。" +msgstr "" msgid "Chart" msgstr "" @@ -3971,9 +3961,8 @@ msgid "CreateBib" msgstr "作成: %s" -#, fuzzy msgid "CreatePage" -msgstr "ページを作成しています。" +msgstr "" #, fuzzy msgid "CreateToc" @@ -4636,7 +4625,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format @@ -5705,9 +5694,8 @@ msgid "Template/Talk" msgstr "" -#, fuzzy msgid "Create Page" -msgstr "ページを作成しています。" +msgstr "" #, fuzzy msgid "History" @@ -5951,9 +5939,8 @@ msgid "Wysiwyg Editor" msgstr "" -#, fuzzy msgid "Past versions of this page." -msgstr "ページを作成しています。" +msgstr "" msgid "Add/Remove this to/from the list of pages you're monitoring for changes" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/nl.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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" @@ -4488,7 +4488,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/phpwiki.pot 2016-12-05 17:48:38 UTC (rev 9987) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+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" @@ -4480,7 +4480,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/sv.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -4481,7 +4481,7 @@ msgid "Check for necessary theme %s updates" msgstr "" -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2016-12-05 17:00:48 UTC (rev 9986) +++ trunk/locale/po/zh.po 2016-12-05 17:48:38 UTC (rev 9987) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-05 17:43+0100\n" +"POT-Creation-Date: 2016-12-05 18:30+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -4714,7 +4714,7 @@ msgid "Check for necessary theme %s updates" msgstr "為 page “%s” 設定 acl." -msgid "rename to Help: pages" +msgid "Rename to Help: pages" msgstr "" #, fuzzy, php-format 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...> - 2016-12-14 17:56:46
|
Revision: 9994 http://sourceforge.net/p/phpwiki/code/9994 Author: vargenau Date: 2016-12-14 17:56:44 +0000 (Wed, 14 Dec 2016) Log Message: ----------- Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) Modified Paths: -------------- trunk/lib/loadsave.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2016-12-12 13:52:55 UTC (rev 9993) +++ trunk/lib/loadsave.php 2016-12-14 17:56:44 UTC (rev 9994) @@ -754,7 +754,7 @@ } } else { $target = "images/" . basename($from); - $zip->addSrcFile($target, $WikiTheme->_path . $from); + $zip->addFile($target); } } elseif (!$silent) { _copyMsg($from, _("... not found")); @@ -789,7 +789,7 @@ } } else { $target = "images/buttons/" . basename($from); - $zip->addSrcFile($target, $WikiTheme->_path . $from); + $zip->addFile($target); } } elseif (!$silent) { _copyMsg($from, _("... not found")); @@ -819,7 +819,7 @@ } else { //$attrib = array('is_ascii' => 0); $target = basename($css_file); - $zip->addSrcFile($target, $WikiTheme->_path . $from); + $zip->addFile($target); } } elseif (!$silent) { _copyMsg($from, _("... not found")); Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2016-12-12 13:52:55 UTC (rev 9993) +++ trunk/pgsrc/ReleaseNotes 2016-12-14 17:56:44 UTC (rev 9994) @@ -1,4 +1,4 @@ -Date: Fri, 14 Oct 2016 17:38:47 +0000 +Date: Wed, 14 Dec 2016 18:55:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -27,6 +27,7 @@ * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php) * Bugs: +** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) * Plugins: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-03-13 16:10:15
|
Revision: 10004 http://sourceforge.net/p/phpwiki/code/10004 Author: vargenau Date: 2017-03-13 16:10:12 +0000 (Mon, 13 Mar 2017) Log Message: ----------- Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. Modified Paths: -------------- trunk/lib/mimelib.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/mimelib.php =================================================================== --- trunk/lib/mimelib.php 2017-01-18 15:49:41 UTC (rev 10003) +++ trunk/lib/mimelib.php 2017-03-13 16:10:12 UTC (rev 10004) @@ -58,7 +58,12 @@ { // Eliminate soft line-breaks. $string = preg_replace('/=[ \t\r]*\n/', '', $string); - return quoted_printable_decode($string); + $decoded = quoted_printable_decode($string); + // When importing e.g. a ZIP from an old wiki in Latin 1 (ISO 8859-1) + if (!is_utf8($decoded)) { + $decoded = utf8_encode($decoded); + } + return $decoded; } define('MIME_TOKEN_REGEXP', "[-!#-'*+.0-9A-Z^-~]+"); Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017-01-18 15:49:41 UTC (rev 10003) +++ trunk/pgsrc/ReleaseNotes 2017-03-13 16:10:12 UTC (rev 10004) @@ -1,4 +1,4 @@ -Date: Wed, 14 Dec 2016 18:55:50 +0000 +Date: Mon, 13 Mar 2017 15:59:30 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -30,6 +30,7 @@ ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) +** Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. * Plugins: ** ~UpLoad plugin: put date and author in history ** ~UpLoad plugin: don't inline images This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-05-21 14:33:41
|
Revision: 10006 http://sourceforge.net/p/phpwiki/code/10006 Author: vargenau Date: 2017-05-21 14:33:38 +0000 (Sun, 21 May 2017) Log Message: ----------- More generic error message for IsSafeURL Modified Paths: -------------- trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/Transclude.php trunk/lib/stdlib.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/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/lib/plugin/PhotoAlbum.php 2017-05-21 14:33:38 UTC (rev 10006) @@ -546,7 +546,7 @@ }*/ //FIXME! if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } $photos[] = array("name" => $src, //album_location."/$src".album_default_extension, "desc" => ""); @@ -560,7 +560,7 @@ * @param string $src path to dir or textfile (local or remote) * @param array $photos * @param string $webpath - * @return string Error when bad url or file couldn't be opened + * @return string Error when bad URL or file couldn't be opened */ function fromFile($src, &$photos, $webpath = '') { @@ -574,7 +574,7 @@ return $this->error(_("File extension for csv file has to be '.csv'")); } if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } if (preg_match('/^(http|ftp|https):\/\//i', $src)) { $contents = url_get_contents($src); Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/lib/plugin/Transclude.php 2017-05-21 14:33:38 UTC (rev 10006) @@ -93,7 +93,7 @@ return $this->error(fmt("Recursive inclusion of url %s", $src)); } if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } $params = array('title' => $title, Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/lib/stdlib.php 2017-05-21 14:33:38 UTC (rev 10006) @@ -369,7 +369,7 @@ { // FIXME: Is this needed (or sufficient?) if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL -- remove all of <, >, "')); + $link = HTML::span(array('class' => 'error'), _('Bad URL')); return $link; } else { if (!$linktext) @@ -407,7 +407,7 @@ $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL for image -- remove all of <, >, "')); + $link = HTML::span(array('class' => 'error'), _('Bad URL for image')); return $link; } // spaces in inline images must be %20 encoded! 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 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/de.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\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." @@ -2242,9 +2242,8 @@ "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen " "Beschreibungen." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "" -"URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"" +msgid "Bad URL in src" +msgstr "URL Formfehler in Quellcode" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4540,11 +4539,11 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \"" +msgid "Bad URL" +msgstr "URL Formfehler" -msgid "Bad URL for image -- remove all of <, >, \"" -msgstr "URL Formfehler für Bild - Entfernen Sie alle Zeichen mit <, >, \"" +msgid "Bad URL for image" +msgstr "URL Formfehler für Bild" #, php-format msgid "Invalid attribute %s=%s for image %s" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/es.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2180,7 +2180,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4407,10 +4407,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/fr.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\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." @@ -2221,8 +2221,8 @@ "Affiche un groupe de photos listées dans un fichier texte avec des " "descriptions facultatives." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "Mauvaise URL dans la source : retirez tous les <, >, \"" +msgid "Bad URL in src" +msgstr "URL incorrecte dans la source" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4504,11 +4504,11 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "Mauvaise URL -- retirez tous les <, >, \"" +msgid "Bad URL" +msgstr "URL incorrecte" -msgid "Bad URL for image -- remove all of <, >, \"" -msgstr "Mauvaise URL pour l'image -- retirez tous les <, >, \"" +msgid "Bad URL for image" +msgstr "URL incorrecte pour l'image" #, php-format msgid "Invalid attribute %s=%s for image %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/it.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\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" @@ -2161,7 +2161,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4384,10 +4384,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/ja.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2147,7 +2147,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4370,10 +4370,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/nl.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -2153,7 +2153,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4376,10 +4376,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/phpwiki.pot 2017-05-21 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2147,7 +2147,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4370,10 +4370,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/sv.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2148,7 +2148,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4371,10 +4371,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017-05-18 18:36:34 UTC (rev 10005) +++ trunk/locale/po/zh.po 2017-05-21 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 15:45+0100\n" +"POT-Creation-Date: 2017-05-21 16:32+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -2156,8 +2156,8 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "顯示帶有簡單描述的文字檔內的相片集合." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \"" +msgid "Bad URL in src" +msgstr "在 src 中錯誤的 URL" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4387,10 +4387,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "錯誤 URL -- 移除所有的 <, >, \"" +msgid "Bad URL" +msgstr "錯誤 URL" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format 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...> - 2017-05-23 09:30:04
|
Revision: 10007 http://sourceforge.net/p/phpwiki/code/10007 Author: vargenau Date: 2017-05-23 09:30:02 +0000 (Tue, 23 May 2017) Log Message: ----------- Better check arguments for GoogleMaps plugin Modified Paths: -------------- trunk/lib/plugin/GoogleMaps.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2017-05-21 14:33:38 UTC (rev 10006) +++ trunk/lib/plugin/GoogleMaps.php 2017-05-23 09:30:02 UTC (rev 10007) @@ -97,9 +97,15 @@ if ($Longitude === '') { return $this->error(sprintf(_("A required argument “%s” is missing."), 'Longitude')); } + if (!is_numeric($Longitude)) { + return $this->error(_('Longitude must be a number.')); + } if ($Latitude === '') { return $this->error(sprintf(_("A required argument “%s” is missing."), 'Latitude')); } + if (!is_numeric($Latitude)) { + return $this->error(_('Latitude must be a number.')); + } $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY)); $id = GenerateId("googlemap"); Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017-05-21 14:33:38 UTC (rev 10006) +++ trunk/pgsrc/ReleaseNotes 2017-05-23 09:30:02 UTC (rev 10007) @@ -1,4 +1,4 @@ -Date: Mon, 13 Mar 2017 15:59:30 +0000 +Date: Tue, 23 May 2017 11:26:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -31,6 +31,7 @@ ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) ** Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. +** Better check arguments for ~GoogleMaps plugin * Plugins: ** ~UpLoad plugin: put date and author in history ** ~UpLoad plugin: don't inline images This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-05-24 18:05:11
|
Revision: 10010 http://sourceforge.net/p/phpwiki/code/10010 Author: vargenau Date: 2017-05-24 18:05:08 +0000 (Wed, 24 May 2017) Log Message: ----------- Require at leastPHP 5.3.3 Modified Paths: -------------- trunk/index.php trunk/lib/main.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/index.php =================================================================== --- trunk/index.php 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/index.php 2017-05-24 18:05:08 UTC (rev 10010) @@ -35,8 +35,8 @@ require_once(dirname(__FILE__) . '/lib/IniConfig.php'); IniConfig(dirname(__FILE__) . "/config/config.ini"); -if (version_compare(PHP_VERSION, '5.3', '<')) { - exit(_("Your PHP version is too old. You must have at least PHP 5.3.")); +if (version_compare(PHP_VERSION, '5.3.3', '<')) { + exit(_("Your PHP version is too old. You must have at least PHP 5.3.3.")); } //////////////////////////////////////////////////////////////// Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/lib/main.php 2017-05-24 18:05:08 UTC (rev 10010) @@ -1394,8 +1394,8 @@ function main() { - if (version_compare(PHP_VERSION, '5.3', '<')) { - exit(_("Your PHP version is too old. You must have at least PHP 5.3.")); + if (version_compare(PHP_VERSION, '5.3.3', '<')) { + exit(_("Your PHP version is too old. You must have at least PHP 5.3.3.")); } if (!USE_DB_SESSION) 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 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/de.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\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." @@ -20,7 +20,7 @@ msgid "CategoryGroup" msgstr "KategorieGruppen" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/es.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -25,7 +25,7 @@ msgid "CategoryGroup" msgstr "GrupoCategoría" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/fr.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\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." @@ -22,9 +22,9 @@ msgid "CategoryGroup" msgstr "CatégorieGroupes" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" -"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3." +"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3.3." msgid "BAD semantic relation link" msgstr "MAUVAIS lien de relation sémantique" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/it.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\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" @@ -19,7 +19,7 @@ msgid "CategoryGroup" msgstr "CategoriaGruppo" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/ja.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/nl.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -22,7 +22,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/phpwiki.pot 2017-05-24 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/sv.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017-05-23 13:47:42 UTC (rev 10009) +++ trunk/locale/po/zh.po 2017-05-24 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 11:33+0200\n" +"POT-Creation-Date: 2017-05-24 19:46+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" 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...> - 2017-05-24 18:19:30
|
Revision: 10011 http://sourceforge.net/p/phpwiki/code/10011 Author: vargenau Date: 2017-05-24 18:19:28 +0000 (Wed, 24 May 2017) Log Message: ----------- Make function IsSafeURL more strict Modified Paths: -------------- trunk/lib/stdlib.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017-05-24 18:05:08 UTC (rev 10010) +++ trunk/lib/stdlib.php 2017-05-24 18:19:28 UTC (rev 10011) @@ -29,7 +29,7 @@ AbsoluteURL ($url) IconForLink ($protocol_or_url) PossiblyGlueIconToText($proto_or_url, $text) - IsSafeURL($url) + IsSafeURL($url, $http_only) LinkURL ($url, $linktext) LinkImage ($url, $alt) ImgObject ($img, $url) @@ -346,16 +346,26 @@ } /** - * Determines if the url passed to function is safe, by detecting if the characters - * '<', '>', or '"' are present. - * Check against their urlencoded values also. + * Determines if the url passed to function is safe + * 1) By detecting if the characters '<', '>', or '"' are present. + * Check against their urlencoded values also. + * 2) By checking the URL syntax is valid * - * @param string $url URL to check for unsafe characters. - * @return bool True if safe, false else. + * @param string $url URL to check + * @param bool $http_only if true, accept only http and https URLs + * @return bool true if safe, false else. */ -function IsSafeURL($url) +function IsSafeURL($url, $http_only = true) { - return !preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url); + if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url) || (filter_var($url, FILTER_VALIDATE_URL) === false)) { + return false; + } + if ($http_only) { + $scheme = parse_url($url, PHP_URL_SCHEME); + return ($scheme == 'http') || ($scheme == 'https'); + } else { + return true; + } } /** @@ -368,7 +378,7 @@ function LinkURL($url, $linktext = '') { // FIXME: Is this needed (or sufficient?) - if (!IsSafeURL($url)) { + if (!IsSafeURL($url, false)) { $link = HTML::span(array('class' => 'error'), _('Bad URL')); return $link; } else { Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017-05-24 18:05:08 UTC (rev 10010) +++ trunk/pgsrc/ReleaseNotes 2017-05-24 18:19:28 UTC (rev 10011) @@ -1,4 +1,4 @@ -Date: Tue, 23 May 2017 11:26:59 +0000 +Date: Wed, 24 May 2017 19:26:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -27,6 +27,7 @@ * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php) * Bugs: +** Make function IsSafeURL more strict ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |