phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[9974] trunk/themes/fusionforge/fusionforge.css

[<var...@us...>]

Revision: 9974
          http://sourceforge.net/p/phpwiki/code/9974
Author:   vargenau
Date:     2016-11-18 16:23:19 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Fix <hr> color and height in Fusionforge theme

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2016-10-16 16:28:21 UTC (rev 9973)
+++ trunk/themes/fusionforge/fusionforge.css	2016-11-18 16:23:19 UTC (rev 9974)
@@ -51,6 +51,11 @@
     color: #565c5e; /* Alcatel-Lucent grey */
 }
 
+hr {
+    height: 2px;
+    background-color: #aaaaaa;
+}
+
 textarea {
     font-family: monospace;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9973] trunk/lib/phpweather-2.2.2

[<var...@us...>]

Revision: 9973
          http://sourceforge.net/p/phpwiki/code/9973
Author:   vargenau
Date:     2016-10-16 16:28:21 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/phpweather-2.2.2/base_object.php
    trunk/lib/phpweather-2.2.2/data_retrieval.php
    trunk/lib/phpweather-2.2.2/db_layer.php
    trunk/lib/phpweather-2.2.2/phpweather.php

Modified: trunk/lib/phpweather-2.2.2/base_object.php
===================================================================
--- trunk/lib/phpweather-2.2.2/base_object.php	2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/base_object.php	2016-10-16 16:28:21 UTC (rev 9973)
@@ -40,7 +40,7 @@
    * @param  $input  array   The initial properties of the object
    * @see    $properties
    */
-  function base_object($input = array()) {
+  function __construct($input = array()) {
 
     include(PHPWEATHER_BASE_DIR . '/defaults-dist.php');
 

Modified: trunk/lib/phpweather-2.2.2/data_retrieval.php
===================================================================
--- trunk/lib/phpweather-2.2.2/data_retrieval.php	2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/data_retrieval.php	2016-10-16 16:28:21 UTC (rev 9973)
@@ -59,9 +59,9 @@
    * @access	private
    * @param	array   The initial properties of the object.
    */
-  function data_retrieval($input = array()) {
+  function __construct($input = array()) {
     /* We start by calling the parent constructor. */
-    $this->db_layer($input);
+    parent::__construct($input);
 
     /* Then we set the station. */
     $this->set_icao($this->properties['icao']);

Modified: trunk/lib/phpweather-2.2.2/db_layer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_layer.php	2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/db_layer.php	2016-10-16 16:28:21 UTC (rev 9973)
@@ -27,11 +27,11 @@
    *
    * @param  $input  array   Initial properties for the object.
    */
-  function db_layer($input = array()) {
+  function __construct($input = array()) {
     /* We call the parent constructor. */
-    $this->base_object($input);
+    parent::__construct($input);
 
-  /* We then create our db object */
+    /* We then create our db object */
     $this->set_db_type($this->properties['db_type']);
   }
 

Modified: trunk/lib/phpweather-2.2.2/phpweather.php
===================================================================
--- trunk/lib/phpweather-2.2.2/phpweather.php	2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/phpweather.php	2016-10-16 16:28:21 UTC (rev 9973)
@@ -56,11 +56,11 @@
    *
    * @param	array	The initial properties of the object.
    */
-  function phpweather($input = array()) {
+  function __construct($input = array()) {
     /* This class doesn't have any defaults, so it just calls the
      * parent constructor.
      */
-    $this->data_retrieval($input);
+    parent::__construct($input);
 
     $this->decoded_metar = false;
     $this->decoded_metar_arch = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9972] trunk/lib/WikiPluginCached.php

[<var...@us...>]

Revision: 9972
          http://sourceforge.net/p/phpwiki/code/9972
Author:   vargenau
Date:     2016-10-16 15:20:15 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
Fix getImageType prototype

Modified Paths:
--------------
    trunk/lib/WikiPluginCached.php

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-10-14 15:39:20 UTC (rev 9971)
+++ trunk/lib/WikiPluginCached.php	2016-10-16 15:20:15 UTC (rev 9972)
@@ -320,7 +320,7 @@
      * @param  Request $request
      * @return string 'png', 'jpeg' or 'gif'
      */
-    protected function getImageType($dbi, $argarray, &$request)
+    protected function getImageType($dbi, $argarray, $request)
     {
         if (in_array($argarray['imgtype'], preg_split('/\s*:\s*/', PLUGIN_CACHED_IMGTYPES)))
             return $argarray['imgtype'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9971] trunk

[<var...@us...>]

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,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}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]

[phpwiki-checkins] SF.net SVN: phpwiki:[9970] trunk

[<var...@us...>]

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;'),
-'lt'	=> array( 'input'=>'lt','tag'=>'mo', 'output'=>'&lt;'), 			/* 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'=>'&gt;'),
-'>='	=> 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;'),
+	'lt'         => array( 'input'=>'lt',        'tag'=>'mo',     'output'=>'&lt;'),                         // 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'=>'&gt;'),
+	'>='         => 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]

[phpwiki-checkins] SF.net SVN: phpwiki:[9969] trunk/pgsrc/ReleaseNotes

[<var...@us...>]

Revision: 9969
          http://sourceforge.net/p/phpwiki/code/9969
Author:   vargenau
Date:     2016-10-14 10:41:55 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-10-14 10:40:22 UTC (rev 9968)
+++ trunk/pgsrc/ReleaseNotes	2016-10-14 10:41:55 UTC (rev 9969)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri, 14 Oct 2016 12:41:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -14,10 +14,12 @@
 * PHP 7 compatible
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 
+Changes:
 * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
 * Pear: use ##mysqli## instead of ##mysql##
 * Update Pear DB library to 1.9.2
 * Replace ##ereg## functions
+* Update Adodb to version 5.20.7
 * 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.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9968] trunk/lib/WikiDB/adodb

[<var...@us...>]

Revision: 9968
          http://sourceforge.net/p/phpwiki/code/9968
Author:   vargenau
Date:     2016-10-14 10:40:22 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Update Adodb to version 5.20.7

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/README.md
    trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
    trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
    trunk/lib/WikiDB/adodb/adodb-error.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
    trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
    trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pager.inc.php
    trunk/lib/WikiDB/adodb/adodb-pear.inc.php
    trunk/lib/WikiDB/adodb/adodb-perf.inc.php
    trunk/lib/WikiDB/adodb/adodb-php4.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
    trunk/lib/WikiDB/adodb/adodb.inc.php
    trunk/lib/WikiDB/adodb/composer.json
    trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
    trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
    trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
    trunk/lib/WikiDB/adodb/pivottable.inc.php
    trunk/lib/WikiDB/adodb/rsfilter.inc.php
    trunk/lib/WikiDB/adodb/server.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
    trunk/lib/WikiDB/adodb/session/adodb-session.php
    trunk/lib/WikiDB/adodb/session/adodb-session2.php
    trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session.php
    trunk/lib/WikiDB/adodb/toexport.inc.php
    trunk/lib/WikiDB/adodb/tohtml.inc.php

Added Paths:
-----------
    trunk/lib/WikiDB/adodb/.mailmap
    trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch
    trunk/lib/WikiDB/adodb/LICENSE.md
    trunk/lib/WikiDB/adodb/docs/README.md
    trunk/lib/WikiDB/adodb/docs/changelog.md
    trunk/lib/WikiDB/adodb/docs/changelog_v2.x.md
    trunk/lib/WikiDB/adodb/docs/changelog_v3.x.md
    trunk/lib/WikiDB/adodb/docs/changelog_v4+5.md
    trunk/lib/WikiDB/adodb/docs/changelog_v4.x.md
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlsrv.inc.php
    trunk/lib/WikiDB/adodb/fix-202.php
    trunk/lib/WikiDB/adodb/fix-226.php
    trunk/lib/WikiDB/adodb/nbproject/
    trunk/lib/WikiDB/adodb/nbproject/private/
    trunk/lib/WikiDB/adodb/nbproject/private/config.properties
    trunk/lib/WikiDB/adodb/nbproject/private/private.properties
    trunk/lib/WikiDB/adodb/nbproject/private/private.xml
    trunk/lib/WikiDB/adodb/nbproject/project.properties
    trunk/lib/WikiDB/adodb/nbproject/project.xml
    trunk/lib/WikiDB/adodb/pr265.php
    trunk/lib/WikiDB/adodb/test.xml

Removed Paths:
-------------
    trunk/lib/WikiDB/adodb/docs/adodb-faq.html
    trunk/lib/WikiDB/adodb/docs/docs-active-record.htm
    trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
    trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
    trunk/lib/WikiDB/adodb/docs/docs-oracle.htm
    trunk/lib/WikiDB/adodb/docs/docs-perf.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
    trunk/lib/WikiDB/adodb/docs/index.html
    trunk/lib/WikiDB/adodb/docs/old-changelog.htm
    trunk/lib/WikiDB/adodb/docs/tips_portable_sql.htm
    trunk/lib/WikiDB/adodb/docs/tute.htm
    trunk/lib/WikiDB/adodb/drivers/adodb-text.inc.php
    trunk/lib/WikiDB/adodb/license.txt
    trunk/lib/WikiDB/adodb/tests/

Added: trunk/lib/WikiDB/adodb/.mailmap
===================================================================
--- trunk/lib/WikiDB/adodb/.mailmap	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/.mailmap	2016-10-14 10:40:22 UTC (rev 9968)
@@ -0,0 +1,4 @@
+Andreas Fernandez <a.f...@sc...> <and...@as...>
+Mike Benoit <mi...@ti...> MikeB <ip...@sn...>
+Mike Benoit <mi...@ti...> mike.benoit
+

Added: trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch
===================================================================
--- trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch	2016-10-14 10:40:22 UTC (rev 9968)
@@ -0,0 +1,60 @@
+From 9fbb2c7751c0fdb89062a87910730ea9ccb5d04c Mon Sep 17 00:00:00 2001
+From: peterdd <dd...@li...>
+Date: Thu, 4 Aug 2016 04:10:12 +0200
+Subject: [PATCH] XML: add support for 'DESCR' tags for tables/fields
+
+Fixes #265
+
+Signed-off-by: Damien Regad <dr...@ma...>
+
+Original commits squashed; commit message reworded; updated changelog.
+---
+ adodb-xmlschema03.inc.php | 12 ++++++++++++
+ docs/changelog.md         |  1 +
+ 2 files changed, 13 insertions(+)
+
+diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php
+index c1ecb88..794f5e2 100644
+--- a/adodb-xmlschema03.inc.php
++++ b/adodb-xmlschema03.inc.php
+@@ -347,6 +347,14 @@ class dbTable extends dbObject {
+ 	*/
+ 	function _tag_cdata( &$parser, $cdata ) {
+ 		switch( $this->currentElement ) {
++			// Table or field comment
++			case 'DESCR':
++				if( isset( $this->current_field ) ) {
++					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
++				} else {
++					$this->addTableComment( $cdata );
++				}
++				break;
+ 			// Table/field constraint
+ 			case 'CONSTRAINT':
+ 				if( isset( $this->current_field ) ) {
+@@ -511,6 +519,10 @@ class dbTable extends dbObject {
+ 		return $this->opts;
+ 	}
+ 
++	function addTableComment( $opt ) {
++		$this->opts['comment'] = $opt;
++		return $this->opts;
++	}
+ 
+ 	/**
+ 	* Generates the SQL that will create the table in the database
+diff --git a/docs/changelog.md b/docs/changelog.md
+index 742f4e4..1fe10f4 100644
+--- a/docs/changelog.md
++++ b/docs/changelog.md
+@@ -44,6 +44,7 @@ Older changelogs:
+ - sqlite: Fix Metataypes mapping. #177
+ - sqlite: driver did not support metaForeignKeys. #179
+ - session: add 'httponly' flag to cookie. #190
++- xml: add support for 'DESCR' tags for tables/fields. #265
+ 
+ ## 5.20.6 - 31-Aug-2016
+ 
+-- 
+2.7.4
+

Added: trunk/lib/WikiDB/adodb/LICENSE.md
===================================================================
--- trunk/lib/WikiDB/adodb/LICENSE.md	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/LICENSE.md	2016-10-14 10:40:22 UTC (rev 9968)
@@ -0,0 +1,496 @@
+ADOdb License
+=============
+
+ADOdb is dual licensed under BSD and LGPL.
+
+In plain English, you do not need to distribute your application in source code form,
+nor do you need to distribute ADOdb source code, provided you follow the rest of
+terms of the BSD license.
+
+For more info about ADOdb, visit http://adodb.sourceforge.net/
+
+BSD 3-Clause License
+--------------------
+
+(c) 2000-2013 John Lim (jl...@na...)
+(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+### DISCLAIMER
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+GNU LESSER GENERAL PUBLIC LICENSE
+---------------------------------
+
+_Version 2.1, February 1999_
+_Copyright © 1991, 1999 Free Software Foundation, Inc._
+_51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA_
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+_This is the first released version of the Lesser GPL.  It also counts
+as the successor of the GNU Library Public License, version 2, hence
+the version number 2.1._
+
+### Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: **(1)** we copyright the
+library, and **(2)** we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+We call this license the “Lesser” General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+“work based on the library” and a “work that uses the library”.  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called “this License”).
+Each licensee is addressed as “you”.
+
+A “library” means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+The “Library”, below, refers to any such software library or work
+which has been distributed under these terms.  A “work based on the
+Library” means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term “modification”.)
+
+“Source code” for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+**1.** You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+**2.** You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+* **a)** The modified work must itself be a software library.
+* **b)** You must cause the files modified to carry prominent notices
+stating that you changed the files and the date of any change.
+* **c)** You must cause the whole of the work to be licensed at no
+charge to all third parties under the terms of this License.
+* **d)** If a facility in the modified Library refers to a function or a
+table of data to be supplied by an application program that uses
+the facility, other than as an argument passed when the facility
+is invoked, then you must make a good faith effort to ensure that,
+in the event an application does not supply such function or
+table, the facility still operates, and performs whatever part of
+its purpose remains meaningful.
+(For example, a function in a library to compute square roots has
+a purpose that is entirely well-defined independent of the
+application.  Therefore, Subsection 2d requires that any
+application-supplied function or table used by this function must
+be optional: if the application does not supply it, the square
+root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+**3.** You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+**4.** You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+**5.** A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a “work that uses the Library”.  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+However, linking a “work that uses the Library” with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a “work that uses the
+library”.  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+When a “work that uses the Library” uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+**6.** As an exception to the Sections above, you may also combine or
+link a “work that uses the Library” with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+* **a)** Accompany the work with the complete corresponding
+machine-readable source code for the Library including whatever
+changes were used in the work (which must be distributed under
+Sections 1 and 2 above); and, if the work is an executable linked
+with the Library, with the complete machine-readable “work that
+uses the Library”, as object code and/or source code, so that the
+user can modify the Library and then relink to produce a modified
+executable containing the modified Library.  (It is understood
+that the user who changes the contents of definitions files in the
+Library will not necessarily be able to recompile the application
+to use the modified definitions.)
+* **b)** Use a suitable shared library mechanism for linking with the
+Library.  A suitable mechanism is one that (1) uses at run time a
+copy of the library already present on the user's computer system,
+rather than copying library functions into the executable, and (2)
+will operate properly with a modified version of the library, if
+the user installs one, as long as the modified version is
+interface-compatible with the version that the work was made with.
+* **c)** Accompany the work with a written offer, valid for at
+least three years, to give the same user the materials
+specified in Subsection 6a, above, for a charge no more
+than the cost of performing this distribution.
+* **d)** If distribution of the work is made by offering access to copy
+from a designated place, offer equivalent access to copy the above
+specified materials from the same place.
+* **e)** Verify that the user has already received a copy of these
+materials or that you have already sent this user a copy.
+
+For an executable, the required form of the “work that uses the
+Library” must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+**7.** You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+* **a)** Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities.  This must be distributed under the terms of the
+Sections above.
+* **b)** Give prominent notice with the combined library of the fact
+that part of it is a work based on the Library, and explaining
+where to find the accompanying uncombined form of the same work.
+
+**8.** You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+**9.** You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+**10.** Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+**11.** If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+**12.** If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+**13.** The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+“any later version”, you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+**14.** If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+### NO WARRANTY
+
+**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY “AS IS” WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+_END OF TERMS AND CONDITIONS_

Modified: trunk/lib/WikiDB/adodb/README.md
===================================================================
--- trunk/lib/WikiDB/adodb/README.md	2016-10-14 08:43:58 UTC (rev 9967)
+++ trunk/lib/WikiDB/adodb/README.md	2016-10-14 10:40:22 UTC (rev 9968)
@@ -1,14 +1,30 @@
-ADODB Library for PHP5
+ADOdb Library for PHP5
 ======================
 
-(c) 2000-2014 John Lim (jl...@na...)
+[![Join chat on Gitter](https://img.shields.io/gitter/room/form-data/form-data.svg)](https://gitter.im/adodb/adodb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Download ADOdb](https://img.shields.io/sourceforge/dm/adodb.svg)](https://sourceforge.net/projects/adodb/files/latest/download)
 
-Released under both BSD and GNU Lesser GPL library license.
-This means you can use it in proprietary products.
+(c) 2000-2013 John Lim (jl...@na...)  
+(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
 
-Home page: http://adodb.sourceforge.net/
+Released under both [BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) 
+and [GNU Lesser GPL library 2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license) 
+licenses.  
+This means you can use it in proprietary products; 
+see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details.
 
+Home page: http://adodb.org/
 
+> **WARNING: known issue with Associative Fetch Mode in ADOdb v5.19
+-- PLEASE UPGRADE TO v5.20 !**  
+> When fetching data in Associative mode (i.e. when `$ADODB_FETCH_MODE` is
+> set to *ADODB_FETCH_ASSOC*), recordsets do not return any data (empty strings)
+> when using some database drivers. The problem has been reported on MSSQL,
+> Interbase and Foxpro, but possibly affects other drivers as well; all drivers
+> derived from the above are also impacted.
+> For further details, please refer to [Issue #20](https://github.com/ADOdb/ADOdb/issues/20).
+
+
 Introduction
 ============
 
@@ -51,18 +67,14 @@
 Documentation and Examples
 ==========================
 
-Refer to the `docs` directory for library documentation and examples.
+Refer to the [ADOdb website](http://adodb.org/) for library documentation and examples. The documentation can also be [downloaded for offline viewing](https://sourceforge.net/projects/adodb/files/Documentation/).
 
-- Main documentation: `docs-adodb.htm`.
-  Query, update and insert records using a portable API.
-- Data dictionary docs: `docs-datadict.htm`.
-  Describes how to create database tables and indexes in a portable manner.
-- Database performance monitoring docs: `docs-perf.htm`.
-  Allows you to perform health checks, tune and monitor your database.
-- Database-backed session docs: `docs-session.htm`.
+- [Main documentation](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:userguide_index): Query, update and insert records using a portable API.
+- [Data dictionary](http://adodb.org/dokuwiki/doku.php?id=v5:dictionary:dictionary_index) describes how to create database tables and indexes in a portable manner.
+- [Database performance monitoring](http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index) allows you to perform health checks, tune and monitor your database.
+- [Database-backed sessions](http://adodb.org/dokuwiki/doku.php?id=v5:session:session_index).
 
-There is also a tutorial `tute.htm` that contrasts ADOdb code with
-mysql code.
+There is also a [tutorial](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:mysql_tutorial) that contrasts ADOdb code with PHP native MySQL code.
 
 
 Files
@@ -78,9 +90,12 @@
 tables are created in test.php.
 
 
-Feature Requests and Bug Reports
-================================
+Support
+=======
 
+To discuss with the ADOdb development team and users, connect to our
+[Gitter chatroom](https://gitter.im/adodb/adodb) using your Github credentials.
+
 Please report bugs, issues and feature requests on Github:
 
 https://github.com/ADOdb/ADOdb/issues

Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2016-10-14 08:43:58 UTC (rev 9967)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2016-10-14 10:40:22 UTC (rev 9968)
@@ -1,7 +1,9 @@
 <?php
 /*
 
-@version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version   v5.20.7  20-Sep-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Latest version is available at http://adodb.sourceforge.net
 
   Released under both BSD license and Lesser GPL library license.
@@ -52,10 +54,13 @@
 
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
-				if ($d->db === $db) return $k;
+				if ($d->db === $db) {
+					return $k;
+				}
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) {
 					return $k;
+				}
 			}
 		}
 
@@ -63,9 +68,10 @@
 		$obj->db = $db;
 		$obj->tables = array();
 
-		if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS);
+		if ($index == false) {
+			$index = sizeof($_ADODB_ACTIVE_DBS);
+		}
 
-
 		$_ADODB_ACTIVE_DBS[$index] = $obj;
 
 		return sizeof($_ADODB_ACTIVE_DBS)-1;
@@ -92,7 +98,9 @@
 	static function UseDefaultValues($bool=null)
 	{
 	global $ADODB_ACTIVE_DEFVALS;
-		if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+		if (isset($bool)) {
+			$ADODB_ACTIVE_DEFVALS = $bool;
+		}
 		return $ADODB_ACTIVE_DEFVALS;
 	}
 
@@ -120,14 +128,21 @@
 		}
 
 		if (!$table) {
-			if (!empty($this->_table)) $table = $this->_table;
+			if (!empty($this->_table)) {
+				$table = $this->_table;
+			}
 			else $table = $this->_pluralize(get_class($this));
 		}
 		$this->foreignName = strtolower(get_class($this)); // CFR: default foreign name
 		if ($db) {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else if (!isset($this->_dbat)) {
-			if (sizeof($_ADODB_ACTIVE_DBS) == 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
+			if (sizeof($_ADODB_ACTIVE_DBS) == 0) {
+				$this->Error(
+					"No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",
+					'ADODB_Active_Record::__constructor'
+				);
+			}
 			end($_ADODB_ACTIVE_DBS);
 			$this->_dbat = key($_ADODB_ACTIVE_DBS);
 		}
@@ -146,7 +161,9 @@
 
 	function _pluralize($table)
 	{
-		if (!ADODB_Active_Record::$_changeNames) return $table;
+		if (!ADODB_Active_Record::$_changeNames) {
+			return $table;
+		}
 
 		$ut = strtoupper($table);
 		$len = strlen($table);
@@ -160,8 +177,9 @@
 		case 'X':
 			return $table.'es';
 		case 'H':
-			if ($lastc2 == 'CH' || $lastc2 == 'SH')
+			if ($lastc2 == 'CH' || $lastc2 == 'SH') {
 				return $table.'es';
+			}
 		default:
 			return $table.'s';
 		}
@@ -172,24 +190,28 @@
 	function _singularize($tables)
 	{
 
-		if (!ADODB_Active_Record::$_changeNames) return $table;
+		if (!ADODB_Active_Record::$_changeNames) {
+			return $table;
+		}
 
 		$ut = strtoupper($tables);
 		$len = strlen($tables);
-		if($ut[$len-1] != 'S')
+		if($ut[$len-1] != 'S') {
 			return $tables; // I know...forget oxen
-		if($ut[$len-2] != 'E')
+		}
+		if($ut[$len-2] != 'E') {
 			return substr($tables, 0, $len-1);
-		switch($ut[$len-3])
-		{
+		}
+		switch($ut[$len-3]) {
 			case 'S':
 			case 'X':
 				return substr($tables, 0, $len-2);
 			case 'I':
 				return substr($tables, 0, $len-3) . 'y';
 			case 'H';
-				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S')
+				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') {
 					return substr($tables, 0, $len-2);
+				}
 			default:
 				return substr($tables, 0, $len-1); // ?
 		}
@@ -216,7 +238,9 @@
 	// use when you don't want ADOdb to auto-pluralize tablename
 	static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
 	{
-		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
+		if (!is_array($tablePKey)) {
+			$tablePKey = array($tablePKey);
+		}
 		$ar = new ADODB_Active_Record($table,$tablePKey);
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
@@ -260,7 +284,9 @@
 
 	static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
-		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
+		if (!is_array($tablePKey)) {
+			$tablePKey = array($tablePKey);
+		}
 		$ar = new ADOdb_Active_Record($table, $tablePKey);
 		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
 	}
@@ -289,24 +315,34 @@
 	{
 		$extras = array();
 		$table = $this->TableInfo();
-		if ($limit >= 0) $extras['limit'] = $limit;
-		if ($offset >= 0) $extras['offset'] = $offset;
+		if ($limit >= 0) {
+			$extras['limit'] = $limit;
+		}
+		if ($offset >= 0) {
+			$extras['offset'] = $offset;
+		}
 
-		if (strlen($whereOrderBy))
-			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
-				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
-					$whereOrderBy = 'AND '.$whereOrderBy;
+		if (strlen($whereOrderBy)) {
+			if (!preg_match('/^[ \n\r]*AND/i', $whereOrderBy)) {
+				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i', $whereOrderBy)) {
+					$whereOrderBy = 'AND ' . $whereOrderBy;
+				}
+			}
+		}
 
-		if(!empty($table->_belongsTo[$name]))
-		{
+		if(!empty($table->_belongsTo[$name])) {
 			$obj = $table->_belongsTo[$name];
 			$columnName = $obj->foreignKey;
-			if(empty($this->$columnName))
+			if(empty($this->$columnName)) {
 				$this->$name = null;
-			else
-			{
-				if ($obj->parentKey) $key = $obj->parentKey;
-				else $key = reset($table->keys);
+			}
+			else {
+				if ($obj->parentKey) {
+					$key = $obj->parentKey;
+				}
+				else {
+					$key = reset($table->keys);
+				}
 
 				$arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras);
 				if ($arrayOfOne) {
@@ -315,8 +351,7 @@
 				}
 			}
 		}
-		if(!empty($table->_hasMany[$name]))
-		{
+		if(!empty($table->_hasMany[$name])) {
 			$obj = $table->_hasMany[$name];
 			$key = reset($table->keys);
 			$id = @$this->$key;
@@ -325,7 +360,9 @@
 				$id = $db->qstr($id);
 			}
 			$objs = $obj->Find($obj->foreignKey.'='.$id. ' '.$whereOrderBy,false,false,$extras);
-			if (!$objs) $objs = array();
+			if (!$objs) {
+				$objs = array();
+			}
 			$this->$name = $objs;
 			return $objs;
 		}
@@ -349,10 +386,12 @@
 
 			$acttab = $tables[$tableat];
 			foreach($acttab->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
-				$this->$name = $fld->default_value;
-			else
-				$this->$name = null;
+				if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) {
+					$this->$name = $fld->default_value;
+				}
+				else {
+					$this->$name = null;
+				}
 			}
 			return;
 		}
@@ -368,10 +407,12 @@
 				// ideally, you should cache at least 32 secs
 
 				foreach($acttab->flds as $name => $fld) {
-					if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
+					if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) {
 						$this->$name = $fld->default_value;
-					else
+					}
+					else {
 						$this->$name = null;
+					}
 				}
 
 				$activedb->tables[$table] = $acttab;
@@ -387,11 +428,15 @@
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		if ($db->fetchMode !== false) {
+			$savem = $db->SetFetchMode(false);
+		}
 
 		$cols = $db->MetaColumns($table);
 
-		if (isset($savem)) $db->SetFetchMode($savem);
+		if (isset($savem)) {
+			$db->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 
 		if (!$cols) {
@@ -403,7 +448,9 @@
 			if (isset($fld->primary_key)) {
 				$pkeys = array();
 				foreach($cols as $name => $fld) {
-					if (!empty($fld->primary_key)) $pkeys[] = $name;
+					if (!empty($fld->primary_key)) {
+						$pkeys[] = $name;
+					}
 				}
 			} else
 				$pkeys = $this->GetPrimaryKeys($db, $table);
@@ -420,10 +467,12 @@
 		case 0:
 			foreach($cols as $name => $fldobj) {
 				$name = strtolower($name);
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -435,10 +484,12 @@
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
 
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 
@@ -450,10 +501,12 @@
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
 
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -468,14 +521,18 @@
 		if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) {
 			$activetab->_created = time();
 			$s = serialize($activetab);
-			if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			if (!function_exists('adodb_write_file')) {
+				include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			}
 			adodb_write_file($fname,$s);
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
 
-			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
-			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
+			if ($oldtab) {
+				$activetab->_belongsTo = $oldtab->_belongsTo;
+				$activetab->_hasMany = $oldtab->_hasMany;
+			}
 		}
 		$activedb->tables[$table] = $activetab;
 	}
@@ -493,17 +550,26 @@
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
 
-		if ($this->_dbat < 0) $db = false;
+		if ($this->_dbat < 0) {
+			$db = false;
+		}
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
 
 		if (function_exists('adodb_throw')) {
-			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
-			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
-		} else
-			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
+			if (!$db) {
+				adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
+			}
+			else {
+				adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
+			}
+		} else {
+			if (!$db || $db->debug) {
+				ADOConnection::outp($this->_lasterr);
+			}
+		}
 
 	}
 
@@ -511,18 +577,26 @@
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
-			if ($this->_dbat < 0) $db = false;
-			else $db = $this->DB();
+			if ($this->_dbat < 0) {
+				$db = false;
+			}
+			else {
+				$db = $this->DB();
+			}
 
 			// last error could be database error too
-			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
+			if ($db && $db->ErrorMsg()) {
+				return $db->ErrorMsg();
+			}
 		}
 		return $this->_lasterr;
 	}
 
 	function ErrorNo()
 	{
-		if ($this->_dbat < 0) return -9999; // no database connection...
+		if ($this->_dbat < 0) {
+			return -9999; // no database connection...
+		}
 		$db = $this->DB();
 
 		return (int) $db->ErrorNo();
@@ -558,8 +632,11 @@
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
 	{
-		$db =& $this->DB(); if (!$db) return false;
-		$table =& $this->TableInfo();
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
+		$table = $this->TableInfo();
 		$where = $this->GenWhere($db, $table);
 		return($this->Load($where));
 	}
@@ -581,44 +658,47 @@
 
 		$table = $this->TableInfo();
 		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
-            # <AP>
-            $bad_size = TRUE;
-            if (sizeof($row) == 2 * sizeof($table->flds)) {
-                // Only keep string keys
-                $keys = array_filter(array_keys($row), 'is_string');
-                if (sizeof($keys) == sizeof($table->flds))
-                    $bad_size = FALSE;
-            }
-            if ($bad_size) {
+			# <AP>
+			$bad_size = TRUE;
+			if (sizeof($row) == 2 * sizeof($table->flds)) {
+				// Only keep string keys
+				$keys = array_filter(array_keys($row), 'is_string');
+				if (sizeof($keys) == sizeof($table->flds)) {
+					$bad_size = FALSE;
+				}
+			}
+			if ($bad_size) {
 			$this->Error("Table structure of $this->_table has changed","Load");
 			return false;
 		}
-            # </AP>
+			# </AP>
 		}
-        else
+		else
 			$keys = array_keys($row);
 
-        # <AP>
-        reset($keys);
-        $this->_original = array();
+		# <AP>
+		reset($keys);
+		$this->_original = array();
 		foreach($table->flds as $name=>$fld) {
-            $value = $row[current($keys)];
+			$value = $row[current($keys)];
 			$this->$name = $value;
-            $this->_original[] = $value;
-            next($keys);
+			$this->_original[] = $value;
+			next($keys);
 		}
 
-        # </AP>
+		# </AP>
 		return true;
 	}
 
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
-		if ($db->hasInsertID)
+		if ($db->hasInsertID) {
 			$val = $db->Insert_ID($this->_table,$fieldname);
-		else
+		}
+		else {
 			$val = false;
+		}
 
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
@@ -632,19 +712,25 @@
 	{
 		switch($t) {
 		case 'L':
-			if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val);
+			if (strpos($db->databaseType,'postgres') !== false) {
+				return $db->qstr($val);
+			}
 		case 'D':
 		case 'T':
-			if (empty($val)) return 'null';
-
+			if (empty($val)) {
+				return 'null';
+			}
 		case 'B':
 		case 'N':
 		case 'C':
 		case 'X':
-			if (is_null($val)) return 'null';
+			if (is_null($val)) {
+				return 'null';
+			}
 
 			if (strlen($val)>0 &&
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")
+			) {
 				return $db->qstr($val);
 				break;
 			}
@@ -672,8 +758,15 @@
 
 	function _QName($n,$db=false)
 	{
-		if (!ADODB_Active_Record::$_quoteNames) return $n;
-		if (!$db) $db = $this->DB(); if (!$db) return false;
+		if (!ADODB_Active_Record::$_quoteNames) {
+			return $n;
+		}
+		if (!$db) {
+			$db = $this->DB();
+			if (!$db) {
+				return false;
+			}
+		}
 		return $db->nameQuote.$n.$db->nameQuote;
 	}
 
@@ -683,23 +776,32 @@
 	{
 	global $ADODB_FETCH_MODE;
 
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$this->_where = $where;
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		if ($db->fetchMode !== false) {
+			$savem = $db->SetFetchMode(false);
+		}
 
 		$qry = "select * from ".$this->_table;
 
 		if($where) {
 			$qry .= ' WHERE '.$where;
 		}
-		if ($lock) $qry .= $this->lockMode;
+		if ($lock) {
+			$qry .= $this->lockMode;
+		}
 
 		$row = $db->GetRow($qry,$bindarr);
 
-		if (isset($savem)) $db->SetFetchMode($savem);
+		if (isset($savem)) {
+			$db->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 
 		return $this->Set($row);
@@ -714,25 +816,29 @@
 	# see http://phplens.com/lens/lensforum/msgs.php?id=17795
 	function Reset()
 	{
-        $this->_where=null;
-        $this->_saved = false;
-        $this->_lasterr = false;
-        $this->_original = false;
-        $vars=get_object_vars($this);
-        foreach($vars as $k=>$v){
-        	if(substr($k,0,1)!=='_'){
-        		$this->{$k}=null;
-        	}
-        }
-        $this->foreignName=strtolower(get_class($this));
-        return true;
-    }
+		$this->_where=null;
+		$this->_saved = false;
+		$this->_lasterr = false;
+		$this->_original = false;
+		$vars=get_object_vars($this);
+		foreach($vars as $k=>$v){
+			if(substr($k,0,1)!=='_'){
+				$this->{$k}=null;
+			}
+		}
+		$this->foreignName=strtolower(get_class($this));
+		return true;
+	}
 
 	// false on error
 	function Save()
 	{
-		if ($this->_saved) $ok = $this->Update();
-		else $ok = $this->Insert();
+		if ($this->_saved) {
+			$ok = $this->Update();
+		}
+		else {
+			$ok = $this->Insert();
+		}
 
 		return $ok;
 	}
@@ -741,7 +847,10 @@
 	// false on error
 	function Insert()
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$cnt = 0;
 		$table = $this->TableInfo();
 
@@ -791,7 +900,10 @@
 
 	function Delete()
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table = $this->TableInfo();
 
 		$where = $this->GenWhere($db,$table);
@@ -804,7 +916,10 @@
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
-		$db = $this->DB(); if (!$db || empty($this->_table)) return false;
+		$db = $this->DB();
+		if (!$db || empty($this->_table)) {
+			return false;
+		}
 		$arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra);
 		return $arr;
 	}
@@ -814,7 +929,10 @@
 	{
 	global $ADODB_ASSOC_CASE;
 
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table = $this->TableInfo();
 
 		$pkey = $table->keys;
@@ -824,7 +942,9 @@
 			/*
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
-					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
+					if (isset($fld->default_value) && strlen($fld->default_value)) {
+						continue;
+					}
 					else {
 						$this->Error("Cannot update null into $name","Replace");
 						return false;
@@ -832,25 +952,31 @@
 			...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[9967] trunk/lib/plugin/UriResolver.php

[<var...@us...>]

Revision: 9967
          http://sourceforge.net/p/phpwiki/code/9967
Author:   vargenau
Date:     2016-10-14 08:43:58 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Fix allow_undeclared_arg prototype

Modified Paths:
--------------
    trunk/lib/plugin/UriResolver.php

Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php	2016-10-14 08:38:16 UTC (rev 9966)
+++ trunk/lib/plugin/UriResolver.php	2016-10-14 08:43:58 UTC (rev 9967)
@@ -45,7 +45,7 @@
         return array();
     }
 
-    function allow_undeclared_arg()
+    function allow_undeclared_arg($name, $value)
     {
         return true;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9966] trunk/lib/plugin/RecentChanges.php

[<var...@us...>]

Revision: 9966
          http://sourceforge.net/p/phpwiki/code/9966
Author:   vargenau
Date:     2016-10-14 08:38:16 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Fix getMostRecentParams prototype

Modified Paths:
--------------
    trunk/lib/plugin/RecentChanges.php

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016-10-14 08:33:12 UTC (rev 9965)
+++ trunk/lib/plugin/RecentChanges.php	2016-10-14 08:38:16 UTC (rev 9966)
@@ -1340,7 +1340,7 @@
         return $args;
     }
 
-    function getMostRecentParams(&$args)
+    function getMostRecentParams($args)
     {
         $show_all = false;
         $show_minor = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9965] trunk/lib/WikiPluginCached.php

[<var...@us...>]

Revision: 9965
          http://sourceforge.net/p/phpwiki/code/9965
Author:   vargenau
Date:     2016-10-14 08:33:12 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Fix getImageType prototype

Modified Paths:
--------------
    trunk/lib/WikiPluginCached.php

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-10-14 08:24:17 UTC (rev 9964)
+++ trunk/lib/WikiPluginCached.php	2016-10-14 08:33:12 UTC (rev 9965)
@@ -320,7 +320,7 @@
      * @param  Request $request
      * @return string 'png', 'jpeg' or 'gif'
      */
-    protected function getImageType(&$dbi, $argarray, &$request)
+    protected function getImageType($dbi, $argarray, &$request)
     {
         if (in_array($argarray['imgtype'], preg_split('/\s*:\s*/', PLUGIN_CACHED_IMGTYPES)))
             return $argarray['imgtype'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9964] trunk/lib

[<var...@us...>]

Revision: 9964
          http://sourceforge.net/p/phpwiki/code/9964
Author:   vargenau
Date:     2016-10-14 08:24:17 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/Google.php
    trunk/lib/SemanticWeb.php
    trunk/lib/XmlParser.php
    trunk/lib/plugin/RecentComments.php
    trunk/lib/plugin/RelatedChanges.php

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2016-10-13 13:15:43 UTC (rev 9963)
+++ trunk/lib/Google.php	2016-10-14 08:24:17 UTC (rev 9964)
@@ -94,7 +94,7 @@
     public $_fields = "documentFiltering,searchComments,estimatedTotalResultsCount,estimateIsExact,searchQuery,startIndex,endIndex,searchTips,directoryCategories,searchTime,resultElements";
     public $resultElements, $results;
 
-    function GoogleSearchResults($result)
+    function __construct($result)
     {
         $this->fields = explode(',', $this->_fields);
         foreach ($this->fields as $f) {
@@ -150,7 +150,7 @@
 {
     public $_fields = "summary,URL,snippet,title,cachedSize,relatedInformationPresent,hostName,directoryCategory,directoryTitle";
 
-    function GoogleSearchResult($result)
+    function __construct($result)
     {
         $this->fields = explode(',', $this->_fields);
         foreach ($this->fields as $f) {
@@ -162,8 +162,7 @@
 
 class Google
 {
-
-    function Google($maxResults = 10, $license_key = false)
+    function __construct($maxResults = 10, $license_key = false)
     {
         if ($license_key)
             $this->license_key = $license_key;

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2016-10-13 13:15:43 UTC (rev 9963)
+++ trunk/lib/SemanticWeb.php	2016-10-14 08:24:17 UTC (rev 9964)
@@ -371,7 +371,7 @@
  */
 class ReasonerBackend
 {
-    function ReasonerBackend()
+    function __construct()
     {
         ;
     }

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2016-10-13 13:15:43 UTC (rev 9963)
+++ trunk/lib/XmlParser.php	2016-10-14 08:24:17 UTC (rev 9964)
@@ -53,8 +53,8 @@
 {
     public $_parser, $root, $current, $previous, $parent;
 
-    function XmlParser($encoding = '')
-    { //  "ISO-8859-1"
+    function __construct($encoding = '')
+    {
         if ($encoding)
             $this->_parser = xml_parser_create($encoding);
         else

Modified: trunk/lib/plugin/RecentComments.php
===================================================================
--- trunk/lib/plugin/RecentComments.php	2016-10-13 13:15:43 UTC (rev 9963)
+++ trunk/lib/plugin/RecentComments.php	2016-10-14 08:24:17 UTC (rev 9964)
@@ -133,7 +133,7 @@
  */
 class RecentCommentsRevisionIterator extends WikiDB_PageRevisionIterator
 {
-    function RecentCommentsRevisionIterator($revisions, &$dbi)
+    function __construct($revisions, &$dbi)
     {
         $this->_revisions = $revisions;
         $this->_wikidb = $dbi;

Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php	2016-10-13 13:15:43 UTC (rev 9963)
+++ trunk/lib/plugin/RelatedChanges.php	2016-10-14 08:24:17 UTC (rev 9964)
@@ -126,7 +126,7 @@
  */
 class RelatedChangesRevisionIterator extends WikiDB_PageRevisionIterator
 {
-    function RelatedChangesRevisionIterator($revisions, &$dbi, $pagename)
+    function __construct($revisions, &$dbi, $pagename)
     {
         $this->_revisions = $revisions;
         $this->_wikidb = $dbi;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9963] trunk

[<var...@us...>]

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]

[phpwiki-checkins] SF.net SVN: phpwiki:[9962] trunk/lib/Template.php

[<var...@us...>]

Revision: 9962
          http://sourceforge.net/p/phpwiki/code/9962
Author:   vargenau
Date:     2016-10-13 12:56:38 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
Do not use preg_replace with /e to be compatible with PHP 7

Modified Paths:
--------------
    trunk/lib/Template.php

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-10-13 12:55:27 UTC (rev 9961)
+++ trunk/lib/Template.php	2016-10-13 12:56:38 UTC (rev 9962)
@@ -79,41 +79,21 @@
 
     private function _munge_input($template)
     {
+        // Convert < ?plugin expr ? > to < ?php $this->_printPlugin("expr"); ? >
+        $orig[] = '/<\?plugin.*?\?>/s';
+        $repl[] = "<?php \$this->_printPlugin('\\0'); ?>";
 
-        // Convert < ?plugin expr ? > to < ?php $this->_printPluginPI("expr"); ? >
-        $orig[] = '/<\?plugin.*?\?>/se';
-        $repl[] = "\$this->_mungePlugin('\\0')";
+        // Convert <<expr>> to < ?php $this->_printPlugin("expr"); ? >
+        $orig[] = '/<<(.*?)>>/s';
+        $repl[] = "<?php \$this->_printPlugin('<?plugin \\1 ?>'); ?>";
 
-        // Convert <<expr>> to < ?php $this->_printPluginPI("expr"); ? >
-        $orig[] = '/<<.*?>>/se';
-        $repl[] = "\$this->_mungePlugin('\\0')";
-
-        // Convert < ?= expr ? > to < ?php $this->_print(expr); ? >
-        $orig[] = '/<\?=(.*?)\?>/s';
-        $repl[] = '<?php $this->_print(\1);?>';
-
         // Convert < ?php echo expr ? > to < ?php $this->_print(expr); ? >
         $orig[] = '/<\?php echo (.*?)\?>/s';
         $repl[] = '<?php $this->_print(\1);?>';
 
-        // Avoid PHP 5.5 warning about /e
-        return @preg_replace($orig, $repl, $template);
+        return preg_replace($orig, $repl, $template);
     }
 
-    private function _mungePlugin($pi)
-    {
-        $pi = preg_replace('/^<</', '<?plugin ', $pi);
-        $pi = preg_replace('/>>$/', ' ?>', $pi);
-
-        // HACK ALERT: PHP's preg_replace, with the /e option seems to
-        // escape both single and double quotes with backslashes.
-        // So we need to unescape the double quotes here...
-
-        $pi = preg_replace('/(?!<\\\\)\\\\"/x', '"', $pi);
-        return sprintf('<?php $this->_printPlugin(%s); ?>',
-            "'" . str_replace("'", "\'", $pi) . "'");
-    }
-
     private function _printPlugin($pi)
     {
         include_once 'lib/WikiPlugin.php';
@@ -136,9 +116,6 @@
 
     private function _expandSubtemplate(&$template)
     {
-        // FIXME: big hack!
-        //if (!$template->_request)
-        //    $template->_request = &$this->_request;
         if (DEBUG) {
             echo "<!-- Begin $template->_name -->\n";
         }
@@ -178,7 +155,6 @@
             $revision = false;
 
         global $WikiTheme;
-        //$this->_dump_template();
         $SEP = $WikiTheme->getButtonSeparator();
 
         global $ErrorManager;
@@ -212,22 +188,8 @@
         return $this->getExpansion();
     }
 
-    // Debugging:
-    private function _dump_template()
-    {
-        $lines = explode("\n", $this->_munge_input($this->_tmpl));
-        $pre = HTML::pre();
-        $n = 1;
-        foreach ($lines as $line)
-            $pre->pushContent(fmt("%4d  %s\n", $n++, $line));
-        $pre->printXML();
-    }
-
     public function _errorHandler($error)
     {
-        //if (!preg_match('/: eval\(\)\'d code$/', $error->errfile))
-        //    return false;
-
         if (preg_match('/: eval\(\)\'d code$/', $error->errfile)) {
             $error->errfile = "In template '$this->_name'";
             // Hack alert: Ignore 'undefined variable' messages for variables

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9961] trunk/lib/plugin/UpLoad.php

[<var...@us...>]

Revision: 9961
          http://sourceforge.net/p/phpwiki/code/9961
Author:   vargenau
Date:     2016-10-13 12:55:27 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
UpLoad plugin: link was incorrect if image filename contained whitespace

Modified Paths:
--------------
    trunk/lib/plugin/UpLoad.php

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016-10-11 08:17:04 UTC (rev 9960)
+++ trunk/lib/plugin/UpLoad.php	2016-10-13 12:55:27 UTC (rev 9961)
@@ -219,13 +219,16 @@
                         $version = $current->getVersion();
                         $text = $current->getPackedContent();
                         if (UPLOAD_USERDIR) {
-                            $image_link = "Upload:$username/$sanified_userfile_name";
+                            $image_link = $username.'/'.$sanified_userfile_name;
                         } else {
-                            $image_link = "Upload:$sanified_userfile_name";
+                            $image_link = $sanified_userfile_name;
                         }
                         if (!is_image($sanified_userfile_name)) {
                             // Don't inline images
-                            $image_link = "[[" . $image_link . "]]";
+                            $image_link = '[[Upload:' . $image_link . ']]';
+                        } else {
+                            // $image_link might contain a space
+                            $image_link = 'Upload:' . rawurlencode($image_link);
                         }
                         $newtext = $text . "\n* " . $image_link;
                         $meta = $current->_data;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9960] trunk/lib/loadsave.php

[<var...@us...>]

Revision: 9960
          http://sourceforge.net/p/phpwiki/code/9960
Author:   vargenau
Date:     2016-10-11 08:17:04 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
Add InterWikiMap to list of mandatory pages

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-10-10 19:43:56 UTC (rev 9959)
+++ trunk/lib/loadsave.php	2016-10-11 08:17:04 UTC (rev 9960)
@@ -1521,7 +1521,8 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder();
 
-    $mandatory = array('SandBox',
+    $mandatory = array('InterWikiMap',
+                       'SandBox',
                        'Template/Category',
                        'Template/Talk',
                        'SpecialPages',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9959] trunk/lib/WikiDB/backend/dbaBase.php

[<var...@us...>]

Revision: 9959
          http://sourceforge.net/p/phpwiki/code/9959
Author:   vargenau
Date:     2016-10-10 19:43:56 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/dbaBase.php

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2016-10-10 19:39:29 UTC (rev 9958)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2016-10-10 19:43:56 UTC (rev 9959)
@@ -777,7 +777,7 @@
 
 class WikiDB_backend_dbaBase_linktable
 {
-    function WikiDB_backend_dbaBase_linktable(&$dba)
+    function __construct(&$dba)
     {
         $this->_db = &$dba;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9958] trunk/lib/plugin/RecentChanges.php

[<var...@us...>]

Revision: 9958
          http://sourceforge.net/p/phpwiki/code/9958
Author:   vargenau
Date:     2016-10-10 19:39:29 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/plugin/RecentChanges.php

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016-10-10 14:14:48 UTC (rev 9957)
+++ trunk/lib/plugin/RecentChanges.php	2016-10-10 19:39:29 UTC (rev 9958)
@@ -30,7 +30,7 @@
     public $_absurls = false;
     public $action = "RecentChanges";
 
-    function _RecentChanges_Formatter($rc_args)
+    function __construct($rc_args)
     {
         $this->_args = $rc_args;
         $this->_diffargs = array('action' => 'diff');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9957] trunk/pgsrc/InterWikiMap

[<var...@us...>]

Revision: 9957
          http://sourceforge.net/p/phpwiki/code/9957
Author:   vargenau
Date:     2016-10-10 14:14:48 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
InterWikiMap is EXTERNAL_PAGE

Modified Paths:
--------------
    trunk/pgsrc/InterWikiMap

Modified: trunk/pgsrc/InterWikiMap
===================================================================
--- trunk/pgsrc/InterWikiMap	2016-10-10 13:21:42 UTC (rev 9956)
+++ trunk/pgsrc/InterWikiMap	2016-10-10 14:14:48 UTC (rev 9957)
@@ -1,9 +1,9 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Mon, 10 Oct 2016 16:12:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=InterWikiMap;
   pagetype=interwikimap;
-  flags=PAGE_LOCKED;
+  flags=PAGE_LOCKED%2CEXTERNAL_PAGE
   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.

[phpwiki-checkins] SF.net SVN: phpwiki:[9956] trunk/lib

[<var...@us...>]

Revision: 9956
          http://sourceforge.net/p/phpwiki/code/9956
Author:   vargenau
Date:     2016-10-10 13:21:42 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
Remove functions to test browser: browserVersion, isBrowserKonqueror, isBrowserSafari, isBrowserOpera

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/config.php
    trunk/lib/plugin/YouTube.php
    trunk/lib/stdlib.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-10-10 13:05:42 UTC (rev 9955)
+++ trunk/lib/WikiTheme.php	2016-10-10 13:21:42 UTC (rev 9956)
@@ -1187,8 +1187,6 @@
     {
         // Don't set title on default style.  This makes it clear to
         // the user which is the default (i.e. most supported) style.
-        if ($is_alt and isBrowserKonqueror())
-            return HTML();
         $link = HTML::link(array('rel' => $is_alt ? 'alternate stylesheet' : 'stylesheet',
             'type' => 'text/css',
             'href' => $this->_findData($css_file)));

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2016-10-10 13:05:42 UTC (rev 9955)
+++ trunk/lib/config.php	2016-10-10 13:21:42 UTC (rev 9956)
@@ -81,53 +81,11 @@
     return (strpos(strtolower(browserAgent()), strtolower($match)) !== false);
 }
 
-// returns a similar number for Netscape/Mozilla (gecko=5.0)/IE/Opera features.
-function browserVersion()
-{
-    $agent = browserAgent();
-    if (strstr($agent, "Mozilla/4.0 (compatible; MSIE"))
-        return (float)substr($agent, 30);
-    elseif (strstr($agent, "Mozilla/5.0 (compatible; Konqueror/"))
-        return (float)substr($agent, 36);
-    elseif (strstr($agent, "AppleWebKit/"))
-        return (float)substr($agent, strpos($agent, "AppleWebKit/") + 12);
-    else
-        return (float)substr($agent, 8);
-}
-
 function isBrowserIE()
 {
-    return (browserDetect('Mozilla/') and
-        browserDetect('MSIE'));
+    return (browserDetect('Mozilla/') and browserDetect('MSIE'));
 }
 
-// must omit display alternate stylesheets: konqueror 3.1.4
-// http://sourceforge.net/tracker/index.php?func=detail&aid=945154&group_id=6121&atid=106121
-function isBrowserKonqueror($version = false)
-{
-    if ($version)
-        return browserDetect('Konqueror/') and browserVersion() >= $version;
-    return browserDetect('Konqueror/');
-}
-
-// MacOSX Safari has certain limitations. Need detection and patches.
-// * no <object>, only <embed>
-function isBrowserSafari($version = false)
-{
-    $found = browserDetect('Spoofer/');
-    $found = browserDetect('AppleWebKit/') || $found;
-    if ($version)
-        return $found and browserVersion() >= $version;
-    return $found;
-}
-
-function isBrowserOpera($version = false)
-{
-    if ($version)
-        return browserDetect('Opera/') and browserVersion() >= $version;
-    return browserDetect('Opera/');
-}
-
 /**
  * If $LANG is undefined:
  * Smart client language detection, based on our supported languages

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2016-10-10 13:05:42 UTC (rev 9955)
+++ trunk/lib/plugin/YouTube.php	2016-10-10 13:21:42 UTC (rev 9956)
@@ -193,9 +193,6 @@
             'type' => 'application/x-shockwave-flash',
             'width' => $width,
             'height' => $height);
-        if (isBrowserSafari()) {
-            return HTML::object($attrs);
-        }
         $object->pushContent(HTML::param(array('name' => 'movie', 'value' => $url)));
         $object->pushContent(HTML::param(array('name' => 'wmode', 'value' => 'transparent')));
         $object->pushContent(HTML::object($attrs));

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016-10-10 13:05:42 UTC (rev 9955)
+++ trunk/lib/stdlib.php	2016-10-10 13:21:42 UTC (rev 9956)
@@ -651,9 +651,6 @@
     if ($params) {
         foreach ($params as $param) $object->pushContent($param);
     }
-    if (isBrowserSafari() and !isBrowserSafari(532)) { // recent chrome can do OBJECT
-        return HTML::embed($object->_attr, $object->_content);
-    }
     $object->pushContent(HTML::embed($object->_attr));
     return $object;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9955] trunk

[<var...@us...>]

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[9954] trunk

[<var...@us...>]

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[9953] trunk

[<var...@us...>]

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[9952] trunk/pgsrc/ReleaseNotes

[<var...@us...>]

Revision: 9952
          http://sourceforge.net/p/phpwiki/code/9952
Author:   vargenau
Date:     2016-10-10 12:36:44 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
Update pgsrc/ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-10-10 12:30:07 UTC (rev 9951)
+++ trunk/pgsrc/ReleaseNotes	2016-10-10 12:36:44 UTC (rev 9952)
@@ -1,4 +1,4 @@
-Date: Wed, 27 Jul 2016 16:49:22 +0000
+Date: Thu,  6 Oct 2016 17:53:36 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -20,6 +20,7 @@
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g wikiadmin.php wikilist.php)
 * Bugs:
+** 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:
 ** ~UpLoad plugin: put date and author in history
@@ -29,6 +30,7 @@
 ** Use jquery.autoheight.js plugin for Transclude plugin
 ** Repair [[Help:PhotoAlbumPlugin|PhotoAlbumPlugin]]
 ** Rename action page ~DebugInfo as ~DebugBackendInfo (to be consistent with plugin name)
+* Adding SPDX-License-Identifier in PHP source files
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9951] trunk/lib

[<var...@us...>]

Revision: 9951
          http://sourceforge.net/p/phpwiki/code/9951
Author:   vargenau
Date:     2016-10-10 12:30:07 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
ReiniUrban --> Reini Urban

Modified Paths:
--------------
    trunk/lib/WikiGroup.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/Forbidden.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/WikiUser/OpenID.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser/Session.php
    trunk/lib/config.php
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiPoll.php

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiGroup.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -609,7 +609,7 @@
  * GroupDb is configured by $DbAuthParams[] statements
  *
  * Fixme: adodb
- * @author ReiniUrban
+ * @author Reini Urban
  */
 class GroupDb extends WikiGroup
 {
@@ -655,7 +655,7 @@
 /**
  * PearDB methods
  *
- * @author ReiniUrban
+ * @author Reini Urban
  */
 class GroupDb_PearDB extends GroupDb
 {
@@ -743,7 +743,7 @@
 /**
  * ADODB methods
  *
- * @author ReiniUrban
+ * @author Reini Urban
  */
 class GroupDb_ADODB extends GroupDb
 {
@@ -838,7 +838,7 @@
  * GroupFile is configured by AUTH_GROUP_FILE
  * groupname: user1 user2 ...
  *
- * @author ReiniUrban
+ * @author Reini Urban
  */
 class GroupFile extends WikiGroup
 {
@@ -944,7 +944,7 @@
 /**
  * Ldap is configured in index.php
  *
- * @author ReiniUrban
+ * @author Reini Urban
  */
 class GroupLdap extends WikiGroup
 {

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/BogoLogin.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/Db.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/File.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/Forbidden.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/HttpAuth.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004,2007 ReiniUrban
+ * Copyright © 2004,2007 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/OpenID.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2010 ReiniUrban
+ * Copyright © 2010 Reini Urban
  * Zend_OpenId_Consumer parts from Zend licensed under
  * http://framework.zend.com/license/new-bsd
  *

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/PdoDb.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004, 2005 ReiniUrban
+ * Copyright © 2004, 2005 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/PearDb.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/PersonalPage.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/WikiUser/Session.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2004 ReiniUrban
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/config.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -61,7 +61,7 @@
 /**
  * Browser Detection Functions
  *
- * @author: ReiniUrban
+ * @author: Reini Urban
  */
 function browserAgent()
 {

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/AddComment.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -29,7 +29,7 @@
  * TODO:
  * For admin user, put checkboxes beside comments to allow for bulk removal.
  *
- * @author: ReiniUrban
+ * @author: Reini Urban
  */
 
 include_once 'lib/plugin/WikiBlog.php';

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/FileInfo.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -32,7 +32,7 @@
  *   <<FileInfo file=Upload:setup.exe display=name,version,date
  *                     format="%s (version: %s, date: %s)" >>
  *
- * @author: ReiniUrban
+ * @author: Reini Urban
  */
 
 class WikiPlugin_FileInfo

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/IncludePages.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -25,7 +25,7 @@
 /**
  * IncludePages: Include a list of multiple pages, based on IncludePage.
  * usage:   <<IncludePages pages=<!plugin-list BackLinks !> >>
- * author:  ReiniUrban
+ * author:  Reini Urban
  */
 
 include_once 'lib/plugin/IncludePage.php';

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/ModeratedPage.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -32,7 +32,7 @@
  * Not yet ready! part 3/3 is missing: The moderator approve/reject methods.
  *
  * See http://phpwiki.fr/Help/ModeratedPagePlugin
- * Author: ReiniUrban
+ * Author: Reini Urban
  */
 
 require_once 'lib/WikiPlugin.php';

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/SqlResult.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -55,7 +55,7 @@
  *     ORDER BY m.date DESC
  *   >>
  *
- * @author: ReiniUrban
+ * @author: Reini Urban
  */
 
 require_once 'lib/PageList.php';

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/UpLoad.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -28,7 +28,7 @@
  *          which should preferably be added to the InterWikiMap
  * Usage:   <<UpLoad>>
  * Author:  NathanGass <ga...@io...>
- * Changes: ReiniUrban <ru...@x-...>,
+ * Changes: Reini Urban <ru...@x-...>,
  *          qubit <rt...@da...>
  *          Marc-Etienne Vargenau, Alcatel-Lucent
  */

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/WikiBlog.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -24,7 +24,7 @@
 
 /**
  * @author: MichaelVanDam, major refactor by JeffDairiki (as AddComment)
- * @author: Changed as baseclass to AddComment and WikiForum and EditToolbar integration by ReiniUrban.
+ * @author: Changed as baseclass to AddComment and WikiForum and EditToolbar integration by Reini Urban.
  */
 
 require_once 'lib/TextSearchQuery.php';

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2016-10-10 12:28:00 UTC (rev 9950)
+++ trunk/lib/plugin/WikiPoll.php	2016-10-10 12:30:07 UTC (rev 9951)
@@ -30,7 +30,7 @@
  *     admin page (view and reset statistics)
  *     for now only radio, support checkboxes (multiple selections) also?
  *
- * Author: ReiniUrban
+ * Author: Reini Urban
  */
 
 class WikiPlugin_WikiPoll

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9950] trunk/lib

[<var...@us...>]

Revision: 9950
          http://sourceforge.net/p/phpwiki/code/9950
Author:   vargenau
Date:     2016-10-10 12:28:00 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
Add SPDX-License-Identifier

Modified Paths:
--------------
    trunk/lib/ArchiveCleaner.php
    trunk/lib/AtomParser.php
    trunk/lib/BlockParser.php
    trunk/lib/CachedMarkup.php
    trunk/lib/Captcha.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php
    trunk/lib/HtmlParser.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/SemanticWeb.php
    trunk/lib/SpamBlocklist.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/Facebook.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/Forbidden.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/WikiUser/IMAP.php
    trunk/lib/WikiUser/LDAP.php
    trunk/lib/WikiUser/LdapUpper.php
    trunk/lib/WikiUser/OpenID.php
    trunk/lib/WikiUser/POP3.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser/Session.php
    trunk/lib/WikiUser.php
    trunk/lib/XmlParser.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php
    trunk/lib/display.php
    trunk/lib/imagecache.php
    trunk/lib/install.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/pdf.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/ArchiveCleaner.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
+/**
+ * Copyright © 2002 Geoffrey T. Dairiki <da...@da...>
  *
  * This file is part of PhpWiki.
  *
@@ -16,6 +17,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+
+ *
  */
 
 class ArchiveCleaner

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/AtomParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2010 Sébastien Le Callonnec
+/**
+ * Copyright © 2010 Sébastien Le Callonnec
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 /**
  * This class is a poor-man Atom parser, it does no validation of the feed.

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/BlockParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
- * Copyright (C) 2004,2005 Reini Urban
- * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2002 Geoffrey T. Dairiki <da...@da...>
+ * Copyright © 2004,2005 Reini Urban
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +19,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 'lib/CachedMarkup.php';
 require_once 'lib/InlineParser.php';

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/CachedMarkup.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
- * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2002 Geoffrey T. Dairiki <da...@da...>
+ * Copyright © 2004-2010 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +19,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 'lib/Units.php';

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/Captcha.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -19,6 +19,9 @@
  * You should have received a copy of the GNU General Public License along
  * with This File; 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+
+ *
  */
 
 class Captcha

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/DbSession/ADODB.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2005 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 /**
@@ -24,6 +27,7 @@
  *
  * @author: Reini Urban
  */
+
 class DbSession_ADODB
     extends DbSession
 {

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/DbSession/PDO.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2005 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 /**
@@ -24,6 +27,7 @@
  *
  * @author: Reini Urban
  */
+
 class DbSession_PDO
     extends DbSession
 {

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/DbSession/SQL.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2005 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/DbSession/dba.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2005 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 /** DBA Sessions
@@ -29,6 +32,7 @@
  *  the db is opened and closed for each access.
  * @author: Reini Urban.
  */
+
 class DbSession_dba
     extends DbSession
 {

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/HtmlParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2004 Reini Urban
+/**
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/IniConfig.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/InlineParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
- * Copyright (C) 2004-2010 Reini Urban
- * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2002 Geoffrey T. Dairiki <da...@da...>
+ * Copyright © 2004-2010 Reini Urban
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +19,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/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/MailNotify.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2006-2007,2009 Reini Urban
- * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2006-2007,2009 Reini Urban
+ * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +18,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/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/PageList.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2004-2010 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +18,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/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/PagePerm.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam
+ * Copyright © 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/PageType.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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 'lib/CachedMarkup.php';

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/Request.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 class Request

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/RssParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -15,6 +15,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/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/SemanticWeb.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2004,2007 Reini Urban
+/**
+ * Copyright © 2004,2007 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/SpamBlocklist.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2005 Reini Urban
+/**
+ * Copyright © 2005 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +18,9 @@
  * 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/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiGroup.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright (C) 2003, 2004 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2003, 2004 $ThePhpWikiProgrammingTeam
+ * Copyright © 2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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+
+ *
  */
 
 if (!defined('GROUP_METHOD') or

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiPluginCached.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright (C) 2002 Johannes Große
- * Copyright (C) 2004,2007 Reini Urban
+/**
+ * Copyright © 2002 Johannes Große
+ * Copyright © 2004,2007 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiTheme.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -16,6 +17,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/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/AdoDb.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 include_once 'lib/WikiUser/Db.php';

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/BogoLogin.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 /** Without stored password. A _BogoLoginPassUser with password

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/Db.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/Facebook.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2009 Reini Urban
+/**
+ * Copyright © 2009 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -19,6 +18,9 @@
  * 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+
+ *
+ *
  * From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html:
  * GET 'http://www.facebook.com/login.php', and rest our virtual browser there to collect the cookies
  * POST to 'https://login.facebook.com/login.php' with the proper parameters

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/File.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 class _FilePassUser

Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/Forbidden.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,12 +17,16 @@
  * 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 PassUser name gets created automatically.
  * That's why this class is empty, but must exist.
  */
+
 class _ForbiddenPassUser
     extends _ForbiddenUser
 {

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/FusionForge.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
 /*
- * Copyright (C) 2006 Alain Peyrat
+ * Copyright © 2006 Alain Peyrat
  *
  * This file is part of PhpWiki.
  *
@@ -18,11 +17,15 @@
  * 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+
+ *
  */
 
 /** Call the FusionForge functions to get the username
  *
  */
+
 class _FusionForgePassUser extends _PassUser
 {
 

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/HttpAuth.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 /**
@@ -32,6 +34,7 @@
  *    Try the available auth methods (most likely Bogo) and sent this header back.
  *    header('Authorization: Basic '.base64_encode("$userid:$passwd")."\r\n";
  */
+
 class _HttpAuthPassUser
     extends _PassUser
 {

Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004,2007 ReiniUrban
+/**
+ * Copyright © 2004,2007 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 /**
@@ -33,6 +35,7 @@
  *    Try the available auth methods (most likely Bogo) and sent this header back.
  *    header('Authorization: Basic '.base64_encode("$userid:$passwd")."\r\n";
  */
+
 class _HttpAuthUpperPassUser
     extends _PassUser
 {

Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/IMAP.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2004 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 class _IMAPPassUser

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/LDAP.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004,2007 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 class _LDAPPassUser

Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/LdapUpper.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2007,2009 Reini Urban
+/**
+ * Copyright © 2007,2009 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 include_once 'lib/WikiUser/LDAP.php';
 

Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/OpenID.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2010 ReiniUrban
+/**
+ * Copyright © 2010 ReiniUrban
  * Zend_OpenId_Consumer parts from Zend licensed under
  * http://framework.zend.com/license/new-bsd
  *
@@ -21,6 +20,9 @@
  * 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+
+ *
+ *
  * This is not yet finished. We do not want to use zend extensions.
  *
  * See http://openid.net/specs/openid-authentication-1_1.html

Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/POP3.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2004 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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 'lib/WikiUser/IMAP.php';

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/PdoDb.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004, 2005 ReiniUrban
+/**
+ * Copyright © 2004, 2005 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 include_once 'lib/WikiUser/Db.php';

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/PearDb.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,7 +17,11 @@
  * 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+
+ *
  */
+
 include_once 'lib/WikiUser/Db.php';
 
 class _PearDbPassUser

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/PersonalPage.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser/Session.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,6 @@
 <?php
-
-/*
- * Copyright (C) 2004 ReiniUrban
+/**
+ * Copyright © 2004 ReiniUrban
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +17,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+
+ *
  */
 
 /**
@@ -27,6 +29,7 @@
  *   define('AUTH_SESS_USER','userid');
  *   define('AUTH_SESS_LEVEL',2);
  */
+
 class _SessionPassUser
     extends _PassUser
 {

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/WikiUser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
+/**
+ * Copyright © 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
+ * Copyright © 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright © 2009-2010 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +19,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/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/XmlParser.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -15,6 +15,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/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/XmlRpcServer.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright (C) 2002, Lawrence Akka <la...@us...>
- * Copyright (C) 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2002, Lawrence Akka <la...@us...>
+ * Copyright © 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/diff.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
+/**
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <da...@da...>
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 // diff.php

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/diff3.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2001 Geoffrey T. Dairiki <da...@da...>
+/**
+ * Copyright © 2001 Geoffrey T. Dairiki <da...@da...>
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 // diff3.php

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/difflib.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
+/**
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <da...@da...>
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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+
+ *
  */
 
 // difflib.php

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/display.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2004-2011 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2004-2011 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -16,6 +17,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+
+ *
  */
 
 // display.php: fetch page or get default content

Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/imagecache.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright (C) 2002 Johannes Große
+/**
+ * Copyright © 2002 Johannes Große
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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/lib/install.php
===================================================================
--- trunk/lib/install.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/install.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2004 $ThePhpWikiProgrammingTeam
+/**
+ * Copyright © 2004 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  *
@@ -17,6 +17,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/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/loadsave.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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 'lib/mimelib.php';

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/main.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,8 +1,8 @@
 <?php
-/*
- * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
+/**
+ * Copyright © 1999-2008 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright © 2009 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -19,6 +19,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+
+ *
  */
 
 define ('USE_PREFS_IN_PAGE', true);

Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/pdf.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,8 +1,8 @@
 <?php
-/*
- * Copyright (C) 2003 Olivier PLATHEY
- * Copyright (C) 200? Don Sebà
- * Copyright (C) 2004,2006,2007 Reini Urban
+/**
+ * Copyright © 2003 Olivier PLATHEY
+ * Copyright © 200? Don Sebà
+ * Copyright © 2004,2006,2007 Reini Urban
  *
  * This file is part of PhpWiki.
  *
@@ -19,6 +19,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+
+ *
  */
 
 //define("USE_EXTERNAL_HTML2PDF", "htmldoc --quiet --format pdf14 --jpeg --webpage --no-toc --no-title %s");

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/stdlib.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 1999-2008 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-10-10 12:26:44 UTC (rev 9949)
+++ trunk/lib/upgrade.php	2016-10-10 12:28:00 UTC (rev 9950)
@@ -1,7 +1,7 @@
 <?php
-/*
- * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
+/**
+ * Copyright © 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
+ * Copyright © 2008 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -18,6 +18,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+
+ *
  */
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.