Compare commits

..

No commits in common. "master" and "slow-upgrades" have entirely different histories.

12 changed files with 221 additions and 521 deletions

View File

@ -1 +0,0 @@
2020-07-29~2020-08-31

View File

@ -1,7 +1,3 @@
# 2020-07-29 (2020-09-01)
* Upgrade DokuWiki
# 2017-02-19b-sandstorm6 (2017-03-14)
* Upgrade DokuWiki

View File

@ -1,20 +1 @@
DokuWiki is a simple to use and highly versatile Open Source wiki
software that doesn't require a database. It is loved by users for its
clean and readable syntax. The ease of maintenance, backup and integration
makes it an administrator's favorite. The large number of plugins
contributed by its vibrant community allow for a broad range of use cases
beyond a traditional wiki.
## Sandstorm Upgrade Troubleshooting
If you've upgraded DokuWiki and are now getting PHP errors in your pages,
you may have a plugin that needs to be upgraded or disabled.
See if the script referenced in the error is in `plugins`. If it is:
* Try to disable or remove the plugin from the admin UI.
* If you can't disable/remove the plugin via the admin:
1. Download a backup of the grain
2. Unzip the backup into a new folder
3. Remove the plugin folder from the unzipped backup tree
4. Rezip up the backup tree, preserving the same base folders
5. Restore the grain from backup
DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. The large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.

View File

@ -27,8 +27,6 @@ if [ ! -e /var/lib/dokuwiki/conf/local.php ]; then
cp /opt/app/local.php /var/lib/dokuwiki/conf
fi
rm -f /var/lib/dokuwiki/conf/conf
# sandstorm-specific things go here
cp /opt/app/local.protected.php /var/lib/dokuwiki/conf
if [ ! -e /var/lib/dokuwiki/data ]; then
echo Adding data.

Binary file not shown.

View File

@ -435,7 +435,6 @@ opt/app/dokuwiki/conf.orig/entities.conf
opt/app/dokuwiki/conf.orig/interwiki.conf
opt/app/dokuwiki/conf.orig/license.php
opt/app/dokuwiki/conf.orig/local.php.dist
opt/app/dokuwiki/conf.orig/manifest.json
opt/app/dokuwiki/conf.orig/mediameta.php
opt/app/dokuwiki/conf.orig/mime.conf
opt/app/dokuwiki/conf.orig/mysql.conf.php.example
@ -454,8 +453,6 @@ opt/app/dokuwiki/data.orig/attic/_dummy
opt/app/dokuwiki/data.orig/cache
opt/app/dokuwiki/data.orig/cache/_dummy
opt/app/dokuwiki/data.orig/deleted.files
opt/app/dokuwiki/data.orig/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.png
opt/app/dokuwiki/data.orig/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.xcf
opt/app/dokuwiki/data.orig/index
opt/app/dokuwiki/data.orig/index/_dummy
opt/app/dokuwiki/data.orig/locks
@ -463,7 +460,6 @@ opt/app/dokuwiki/data.orig/locks/_dummy
opt/app/dokuwiki/data.orig/media
opt/app/dokuwiki/data.orig/media/wiki
opt/app/dokuwiki/data.orig/media/wiki/dokuwiki-128.png
opt/app/dokuwiki/data.orig/media/wiki/dokuwiki.svg
opt/app/dokuwiki/data.orig/media_attic
opt/app/dokuwiki/data.orig/media_attic/_dummy
opt/app/dokuwiki/data.orig/media_meta
@ -475,153 +471,30 @@ opt/app/dokuwiki/data.orig/pages/wiki
opt/app/dokuwiki/data.orig/pages/wiki/dokuwiki.txt
opt/app/dokuwiki/data.orig/pages/wiki/syntax.txt
opt/app/dokuwiki/data.orig/pages/wiki/welcome.txt
opt/app/dokuwiki/data.orig/security.png
opt/app/dokuwiki/data.orig/security.xcf
opt/app/dokuwiki/data.orig/tmp
opt/app/dokuwiki/data.orig/tmp/_dummy
opt/app/dokuwiki/doku.php
opt/app/dokuwiki/feed.php
opt/app/dokuwiki/inc
opt/app/dokuwiki/inc/Action/AbstractAclAction.php
opt/app/dokuwiki/inc/Action/AbstractAction.php
opt/app/dokuwiki/inc/Action/AbstractAliasAction.php
opt/app/dokuwiki/inc/Action/AbstractUserAction.php
opt/app/dokuwiki/inc/Action/Admin.php
opt/app/dokuwiki/inc/Action/Draftdel.php
opt/app/dokuwiki/inc/Action/Edit.php
opt/app/dokuwiki/inc/Action/Exception/ActionAbort.php
opt/app/dokuwiki/inc/Action/Exception/ActionException.php
opt/app/dokuwiki/inc/Action/Redirect.php
opt/app/dokuwiki/inc/Action/Save.php
opt/app/dokuwiki/inc/Action/Show.php
opt/app/dokuwiki/inc/ActionRouter.php
opt/app/dokuwiki/inc/Cache/Cache.php
opt/app/dokuwiki/inc/Cache/CacheInstructions.php
opt/app/dokuwiki/inc/Cache/CacheParser.php
opt/app/dokuwiki/inc/Cache/CacheRenderer.php
opt/app/dokuwiki/inc/ChangeLog/ChangeLog.php
opt/app/dokuwiki/inc/ChangeLog/MediaChangeLog.php
opt/app/dokuwiki/inc/ChangeLog/PageChangeLog.php
opt/app/dokuwiki/inc/Debug/DebugHelper.php
opt/app/dokuwiki/inc/Debug/PropertyDeprecationHelper.php
opt/app/dokuwiki/inc/Draft.php
opt/app/dokuwiki/inc/Extension/ActionPlugin.php
opt/app/dokuwiki/inc/Extension/AdminPlugin.php
opt/app/dokuwiki/inc/Extension/AuthPlugin.php
opt/app/dokuwiki/inc/Extension/CLIPlugin.php
opt/app/dokuwiki/inc/Extension/Event.php
opt/app/dokuwiki/inc/Extension/EventHandler.php
opt/app/dokuwiki/inc/Extension/Plugin.php
opt/app/dokuwiki/inc/Extension/PluginController.php
opt/app/dokuwiki/inc/Extension/PluginInterface.php
opt/app/dokuwiki/inc/Extension/PluginTrait.php
opt/app/dokuwiki/inc/Extension/RemotePlugin.php
opt/app/dokuwiki/inc/Extension/SyntaxPlugin.php
opt/app/dokuwiki/inc/Form/ButtonElement.php
opt/app/dokuwiki/inc/Form/CheckableElement.php
opt/app/dokuwiki/inc/Form/Element.php
opt/app/dokuwiki/inc/Form/Form.php
opt/app/dokuwiki/inc/Form/HTMLElement.php
opt/app/dokuwiki/inc/Form/InputElement.php
opt/app/dokuwiki/inc/Form/LabelElement.php
opt/app/dokuwiki/inc/Form/TagCloseElement.php
opt/app/dokuwiki/inc/Form/TagElement.php
opt/app/dokuwiki/inc/Form/TagOpenElement.php
opt/app/dokuwiki/inc/Form/ValueElement.php
opt/app/dokuwiki/inc/HTTP/DokuHTTPClient.php
opt/app/dokuwiki/inc/HTTP/HTTPClient.php
opt/app/dokuwiki/inc/HTTP/HTTPClientException.php
opt/app/dokuwiki/inc/Input/Get.php
opt/app/dokuwiki/inc/Input/Input.php
opt/app/dokuwiki/inc/Input/Post.php
opt/app/dokuwiki/inc/Input/Server.php
opt/app/dokuwiki/inc/JpegMeta.php
opt/app/dokuwiki/inc/Menu/AbstractMenu.php
opt/app/dokuwiki/inc/Menu/Item/AbstractItem.php
opt/app/dokuwiki/inc/Menu/Item/Admin.php
opt/app/dokuwiki/inc/Menu/Item/Backlink.php
opt/app/dokuwiki/inc/Menu/Item/Edit.php
opt/app/dokuwiki/inc/Menu/Item/Index.php
opt/app/dokuwiki/inc/Menu/Item/Login.php
opt/app/dokuwiki/inc/Menu/Item/Media.php
opt/app/dokuwiki/inc/Menu/Item/Profile.php
opt/app/dokuwiki/inc/Menu/Item/Recent.php
opt/app/dokuwiki/inc/Menu/Item/Register.php
opt/app/dokuwiki/inc/Menu/Item/Revert.php
opt/app/dokuwiki/inc/Menu/Item/Revisions.php
opt/app/dokuwiki/inc/Menu/Item/Subscribe.php
opt/app/dokuwiki/inc/Menu/Item/Top.php
opt/app/dokuwiki/inc/Menu/MenuInterface.php
opt/app/dokuwiki/inc/Menu/MobileMenu.php
opt/app/dokuwiki/inc/Menu/PageMenu.php
opt/app/dokuwiki/inc/Menu/SiteMenu.php
opt/app/dokuwiki/inc/Menu/UserMenu.php
opt/app/dokuwiki/inc/Parsing/Handler/Block.php
opt/app/dokuwiki/inc/Parsing/Handler/CallWriter.php
opt/app/dokuwiki/inc/Parsing/Handler/CallWriterInterface.php
opt/app/dokuwiki/inc/Parsing/Lexer/Lexer.php
opt/app/dokuwiki/inc/Parsing/Lexer/ParallelRegex.php
opt/app/dokuwiki/inc/Parsing/Lexer/StateStack.php
opt/app/dokuwiki/inc/Parsing/Parser.php
opt/app/dokuwiki/inc/Parsing/ParserMode/AbstractMode.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Acronym.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Base.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Code.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Emaillink.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Entity.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Eol.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Externallink.php
opt/app/dokuwiki/inc/Parsing/ParserMode/File.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Footnote.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Formatting.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Header.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Hr.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Html.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Internallink.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Linebreak.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Listblock.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Media.php
opt/app/dokuwiki/inc/Parsing/ParserMode/ModeInterface.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Multiplyentity.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Nocache.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Notoc.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Php.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Plugin.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Preformatted.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Quote.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Quotes.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Rss.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Smiley.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Table.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Unformatted.php
opt/app/dokuwiki/inc/Parsing/ParserMode/Windowssharelink.php
opt/app/dokuwiki/inc/PassHash.php
opt/app/dokuwiki/inc/Remote/AccessDeniedException.php
opt/app/dokuwiki/inc/Remote/RemoteException.php
opt/app/dokuwiki/inc/Search/Indexer.php
opt/app/dokuwiki/inc/Sitemap/Mapper.php
opt/app/dokuwiki/inc/StyleUtils.php
opt/app/dokuwiki/inc/Subscriptions/SubscriberManager.php
opt/app/dokuwiki/inc/TaskRunner.php
opt/app/dokuwiki/inc/HTTPClient.php
opt/app/dokuwiki/inc/Input.class.php
opt/app/dokuwiki/inc/JSON.php
opt/app/dokuwiki/inc/PassHash.class.php
opt/app/dokuwiki/inc/Sitemapper.php
opt/app/dokuwiki/inc/Ui/Admin.php
opt/app/dokuwiki/inc/Ui/Ui.php
opt/app/dokuwiki/inc/Utf8/Asian.php
opt/app/dokuwiki/inc/Utf8/Clean.php
opt/app/dokuwiki/inc/Utf8/PhpString.php
opt/app/dokuwiki/inc/Utf8/Table.php
opt/app/dokuwiki/inc/Utf8/Unicode.php
opt/app/dokuwiki/inc/Utf8/tables/case.php
opt/app/dokuwiki/inc/Utf8/tables/loweraccents.php
opt/app/dokuwiki/inc/Utf8/tables/specials.php
opt/app/dokuwiki/inc/actions.php
opt/app/dokuwiki/inc/auth.php
opt/app/dokuwiki/inc/blowfish.php
opt/app/dokuwiki/inc/cache.php
opt/app/dokuwiki/inc/changelog.php
opt/app/dokuwiki/inc/common.php
opt/app/dokuwiki/inc/compatibility.php
opt/app/dokuwiki/inc/config_cascade.php
opt/app/dokuwiki/inc/confutils.php
opt/app/dokuwiki/inc/defines.php
opt/app/dokuwiki/inc/deprecated.php
opt/app/dokuwiki/inc/fetch.functions.php
opt/app/dokuwiki/inc/events.php
opt/app/dokuwiki/inc/form.php
opt/app/dokuwiki/inc/fulltext.php
opt/app/dokuwiki/inc/html.php
@ -632,24 +505,25 @@ opt/app/dokuwiki/inc/init.php
opt/app/dokuwiki/inc/io.php
opt/app/dokuwiki/inc/lang
opt/app/dokuwiki/inc/lang/en/admin.txt
opt/app/dokuwiki/inc/lang/en/edit.txt
opt/app/dokuwiki/inc/lang/en/lang.php
opt/app/dokuwiki/inc/lang/en/newpage.txt
opt/app/dokuwiki/inc/lang/en/stopwords.txt
opt/app/dokuwiki/inc/legacy.php
opt/app/dokuwiki/inc/lessc.inc.php
opt/app/dokuwiki/inc/load.php
opt/app/dokuwiki/inc/mail.php
opt/app/dokuwiki/inc/media.php
opt/app/dokuwiki/inc/pageutils.php
opt/app/dokuwiki/inc/parser/handler.php
opt/app/dokuwiki/inc/parser/metadata.php
opt/app/dokuwiki/inc/parser/lexer.php
opt/app/dokuwiki/inc/parser/parser.php
opt/app/dokuwiki/inc/parser/renderer.php
opt/app/dokuwiki/inc/parser/xhtml.php
opt/app/dokuwiki/inc/parserutils.php
opt/app/dokuwiki/inc/plugin.php
opt/app/dokuwiki/inc/plugincontroller.class.php
opt/app/dokuwiki/inc/pluginutils.php
opt/app/dokuwiki/inc/preload.php
opt/app/dokuwiki/inc/search.php
opt/app/dokuwiki/inc/subscription.php
opt/app/dokuwiki/inc/template.php
opt/app/dokuwiki/inc/toolbar.php
opt/app/dokuwiki/inc/utf8.php
@ -667,7 +541,6 @@ opt/app/dokuwiki/lib/exe/jquery.php
opt/app/dokuwiki/lib/exe/js.php
opt/app/dokuwiki/lib/exe/mediamanager.php
opt/app/dokuwiki/lib/exe/opensearch.php
opt/app/dokuwiki/lib/exe/taskrunner.php
opt/app/dokuwiki/lib/exe/xmlrpc.php
opt/app/dokuwiki/lib/images
opt/app/dokuwiki/lib/images/README
@ -819,7 +692,6 @@ opt/app/dokuwiki/lib/images/fileicons/rpm.png
opt/app/dokuwiki/lib/images/fileicons/rtf.png
opt/app/dokuwiki/lib/images/fileicons/sh.png
opt/app/dokuwiki/lib/images/fileicons/sql.png
opt/app/dokuwiki/lib/images/fileicons/svg.png
opt/app/dokuwiki/lib/images/fileicons/swf.png
opt/app/dokuwiki/lib/images/fileicons/sxc.png
opt/app/dokuwiki/lib/images/fileicons/sxd.png
@ -897,13 +769,6 @@ opt/app/dokuwiki/lib/images/media_size_medium.png
opt/app/dokuwiki/lib/images/media_size_original.png
opt/app/dokuwiki/lib/images/media_size_small.png
opt/app/dokuwiki/lib/images/mediamanager.png
opt/app/dokuwiki/lib/images/menu/01-edit_pencil.svg
opt/app/dokuwiki/lib/images/menu/02-create_pencil.svg
opt/app/dokuwiki/lib/images/menu/04-show_file-document.svg
opt/app/dokuwiki/lib/images/menu/07-revisions_history.svg
opt/app/dokuwiki/lib/images/menu/08-backlink_link-variant.svg
opt/app/dokuwiki/lib/images/menu/10-top_arrow-up.svg
opt/app/dokuwiki/lib/images/menu/settings.svg
opt/app/dokuwiki/lib/images/minus.gif
opt/app/dokuwiki/lib/images/notify.png
opt/app/dokuwiki/lib/images/ns.png
@ -1066,8 +931,6 @@ opt/app/dokuwiki/lib/plugins.orig/acl/lang/ja/help.txt
opt/app/dokuwiki/lib/plugins.orig/acl/lang/ja/lang.php
opt/app/dokuwiki/lib/plugins.orig/acl/lang/kk
opt/app/dokuwiki/lib/plugins.orig/acl/lang/kk/lang.php
opt/app/dokuwiki/lib/plugins.orig/acl/lang/km
opt/app/dokuwiki/lib/plugins.orig/acl/lang/km/lang.php
opt/app/dokuwiki/lib/plugins.orig/acl/lang/ko
opt/app/dokuwiki/lib/plugins.orig/acl/lang/ko/help.txt
opt/app/dokuwiki/lib/plugins.orig/acl/lang/ko/lang.php
@ -1217,7 +1080,6 @@ opt/app/dokuwiki/lib/plugins.orig/authad/lang/et
opt/app/dokuwiki/lib/plugins.orig/authad/lang/et/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/eu
opt/app/dokuwiki/lib/plugins.orig/authad/lang/eu/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/eu/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/fa
opt/app/dokuwiki/lib/plugins.orig/authad/lang/fa/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/fa/settings.php
@ -1269,7 +1131,6 @@ opt/app/dokuwiki/lib/plugins.orig/authad/lang/pt/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/pt/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ro
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ro/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ro/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ru
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/ru/settings.php
@ -1279,21 +1140,11 @@ opt/app/dokuwiki/lib/plugins.orig/authad/lang/sk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sl
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sl/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sr
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sv
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sv/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/sv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/tr
opt/app/dokuwiki/lib/plugins.orig/authad/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/tr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/uk
opt/app/dokuwiki/lib/plugins.orig/authad/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/uk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/vi
opt/app/dokuwiki/lib/plugins.orig/authad/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/vi/settings.php
opt/app/dokuwiki/lib/plugins.orig/authad/lang/zh
opt/app/dokuwiki/lib/plugins.orig/authad/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/authad/lang/zh-tw/lang.php
@ -1311,9 +1162,6 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ar
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ar/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/bg
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/bg/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ca
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ca/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ca/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs/settings.php
@ -1329,9 +1177,6 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de-informal/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de-informal/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/el
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/el/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/el/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/en
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/en/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/en/settings.php
@ -1342,9 +1187,6 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/es/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/es/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/et
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/et/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/eu
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/eu/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/eu/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa/settings.php
@ -1379,7 +1221,6 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/no
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/no/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/no/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/pl
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/pl/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/pl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/pt
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/pt-br
@ -1391,30 +1232,111 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ru
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ru/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sk
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sl
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sr
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sv
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sv/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/sv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/tr
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/tr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/uk
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/uk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/vi
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/vi/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/zh
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/zh-tw/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/zh/lang.php
opt/app/dokuwiki/lib/plugins.orig/authldap/lang/zh/settings.php
opt/app/dokuwiki/lib/plugins.orig/authldap/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/authmysql
opt/app/dokuwiki/lib/plugins.orig/authmysql/auth.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/conf
opt/app/dokuwiki/lib/plugins.orig/authmysql/conf/default.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/conf/metadata.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/bg
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/bg/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/bg/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de-informal
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de-informal/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de-informal/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/en
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/en/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/en/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/eo
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/eo/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fi
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fi/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fr
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/he
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/he/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hr
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hu
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hu/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/hu/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/it
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/it/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/it/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ja
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ja/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ja/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ko
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ko/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ko/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/lv
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/lv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/nl
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/nl/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/nl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/no
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/no/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/no/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pl
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt-br
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt-br/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt-br/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/pt/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sl
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sv
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/tr
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/tr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh-tw/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh/lang.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh/settings.php
opt/app/dokuwiki/lib/plugins.orig/authmysql/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/authpdo
opt/app/dokuwiki/lib/plugins.orig/authpdo/README
opt/app/dokuwiki/lib/plugins.orig/authpdo/_test
@ -1439,86 +1361,114 @@ opt/app/dokuwiki/lib/plugins.orig/authpdo/conf/metadata.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/bg
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/bg/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ca
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ca/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ca/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cs
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cs/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cs/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cy
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cy/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/da
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/da/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/da/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de-informal
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de-informal/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/el
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/el/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/el/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/es
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/es/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/es/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fa
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fa/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fa/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fr
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hr
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hu
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hu/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/it
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/it/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/it/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ja
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ja/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ja/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ko
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ko/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ko/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/nl
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/nl/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/nl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pl
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pl/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt-br
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt-br/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt-br/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ru
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ru/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/sk
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/sk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/sk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/tr
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/uk
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/uk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/vi
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/vi/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/zh
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/zh/lang.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/zh/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpdo/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/authpgsql
opt/app/dokuwiki/lib/plugins.orig/authpgsql/auth.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/conf
opt/app/dokuwiki/lib/plugins.orig/authpgsql/conf/default.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/conf/metadata.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/bg
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/bg/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cs
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cs/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cy
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cy/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/da
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/da/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/de
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/de-informal
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/de-informal/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/de/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/en
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/en/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/eo
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/eo/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/es
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/es/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/fa
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/fa/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/fr
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/fr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/hr
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/hr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/hu
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/hu/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/it
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/it/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ja
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ja/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ko
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ko/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/lv
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/lv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/nl
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/nl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/no
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/no/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pl
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pt
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pt-br
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pt-br/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/pt/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ru
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/ru/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sk
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sk/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sl
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sl/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sv
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/sv/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/tr
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/tr/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/zh
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/zh-tw/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/zh/settings.php
opt/app/dokuwiki/lib/plugins.orig/authpgsql/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/authplain
opt/app/dokuwiki/lib/plugins.orig/authplain/_test
opt/app/dokuwiki/lib/plugins.orig/authplain/_test/conf
opt/app/dokuwiki/lib/plugins.orig/authplain/_test/conf/auth.users.php
opt/app/dokuwiki/lib/plugins.orig/authplain/_test/escaping.test.php
opt/app/dokuwiki/lib/plugins.orig/authplain/_test/userdata.test.php
opt/app/dokuwiki/lib/plugins.orig/authplain/auth.php
opt/app/dokuwiki/lib/plugins.orig/authplain/lang
opt/app/dokuwiki/lib/plugins.orig/authplain/lang/af
@ -1650,57 +1600,14 @@ opt/app/dokuwiki/lib/plugins.orig/authplain/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/authplain/lang/zh-tw/lang.php
opt/app/dokuwiki/lib/plugins.orig/authplain/lang/zh/lang.php
opt/app/dokuwiki/lib/plugins.orig/authplain/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/cli.php
opt/app/dokuwiki/lib/plugins.orig/config
opt/app/dokuwiki/lib/plugins.orig/config/_test
opt/app/dokuwiki/lib/plugins.orig/config/_test/ConfigParserTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/LoaderTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/AbstractSettingTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingArrayTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingNumericTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingNumericoptTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingOnoffTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingStringTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/Setting/SettingTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/WriterTest.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/configuration.test.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/data
opt/app/dokuwiki/lib/plugins.orig/config/_test/data/config.php
opt/app/dokuwiki/lib/plugins.orig/config/_test/data/metadata.php
opt/app/dokuwiki/lib/plugins.orig/config/admin.php
opt/app/dokuwiki/lib/plugins.orig/config/admin.svg
opt/app/dokuwiki/lib/plugins.orig/config/core
opt/app/dokuwiki/lib/plugins.orig/config/core/ConfigParser.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Configuration.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Loader.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/Setting.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingArray.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingAuthtype.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingCompression.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingDirchoice.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingDisableactions.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingEmail.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingFieldset.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingHidden.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingImConvert.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingLicense.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingMulticheckbox.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingMultichoice.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingNoClass.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingNoDefault.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingNoKnownClass.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingNumeric.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingNumericopt.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingOnoff.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingPassword.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingRegex.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingRenderer.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingSavedir.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingSepchar.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingString.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Setting/SettingUndefined.php
opt/app/dokuwiki/lib/plugins.orig/config/core/Writer.php
opt/app/dokuwiki/lib/plugins.orig/config/images
opt/app/dokuwiki/lib/plugins.orig/config/images/danger.png
opt/app/dokuwiki/lib/plugins.orig/config/images/security.png
@ -1854,9 +1761,6 @@ opt/app/dokuwiki/lib/plugins.orig/config/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/config/lang/uk
opt/app/dokuwiki/lib/plugins.orig/config/lang/uk/intro.txt
opt/app/dokuwiki/lib/plugins.orig/config/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/config/lang/vi
opt/app/dokuwiki/lib/plugins.orig/config/lang/vi/intro.txt
opt/app/dokuwiki/lib/plugins.orig/config/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/config/lang/zh
opt/app/dokuwiki/lib/plugins.orig/config/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/config/lang/zh-tw/intro.txt
@ -1865,7 +1769,9 @@ opt/app/dokuwiki/lib/plugins.orig/config/lang/zh/intro.txt
opt/app/dokuwiki/lib/plugins.orig/config/lang/zh/lang.php
opt/app/dokuwiki/lib/plugins.orig/config/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/config/settings
opt/app/dokuwiki/lib/plugins.orig/config/settings/config.class.php
opt/app/dokuwiki/lib/plugins.orig/config/settings/config.metadata.php
opt/app/dokuwiki/lib/plugins.orig/config/settings/extra.class.php
opt/app/dokuwiki/lib/plugins.orig/config/style.css
opt/app/dokuwiki/lib/plugins.orig/extension
opt/app/dokuwiki/lib/plugins.orig/extension/_test
@ -1912,7 +1818,6 @@ opt/app/dokuwiki/lib/plugins.orig/extension/action.php
opt/app/dokuwiki/lib/plugins.orig/extension/admin.php
opt/app/dokuwiki/lib/plugins.orig/extension/admin.svg
opt/app/dokuwiki/lib/plugins.orig/extension/all.less
opt/app/dokuwiki/lib/plugins.orig/extension/cli.php
opt/app/dokuwiki/lib/plugins.orig/extension/helper
opt/app/dokuwiki/lib/plugins.orig/extension/helper/extension.php
opt/app/dokuwiki/lib/plugins.orig/extension/helper/gui.php
@ -1939,8 +1844,6 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/ca
opt/app/dokuwiki/lib/plugins.orig/extension/lang/ca/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs
opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_plugins.txt
@ -1956,7 +1859,6 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de
@ -1964,19 +1866,11 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de-informal/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/de/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/el/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/en
opt/app/dokuwiki/lib/plugins.orig/extension/lang/en/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/en/intro_plugins.txt
@ -2009,8 +1903,6 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/fr/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/fr/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/fr/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/fr/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/he
opt/app/dokuwiki/lib/plugins.orig/extension/lang/he/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/hr
opt/app/dokuwiki/lib/plugins.orig/extension/lang/hr/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/hr/intro_plugins.txt
@ -2057,10 +1949,6 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/no/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/no/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/no/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pl/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/pt-br
@ -2081,26 +1969,9 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/ru/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/ru/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sk/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sr
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sr/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sr/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sv
opt/app/dokuwiki/lib/plugins.orig/extension/lang/sv/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/tr
opt/app/dokuwiki/lib/plugins.orig/extension/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/uk
opt/app/dokuwiki/lib/plugins.orig/extension/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi/intro_install.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi/intro_plugins.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi/intro_search.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi/intro_templates.txt
opt/app/dokuwiki/lib/plugins.orig/extension/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/extension/lang/zh
opt/app/dokuwiki/lib/plugins.orig/extension/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/extension/lang/zh-tw/intro_install.txt
@ -2299,10 +2170,6 @@ opt/app/dokuwiki/lib/plugins.orig/popularity/lang/uk
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/uk/intro.txt
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/uk/submitted.txt
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/vi
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/vi/intro.txt
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/vi/submitted.txt
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/zh
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/popularity/lang/zh-tw/intro.txt
@ -2454,9 +2321,6 @@ opt/app/dokuwiki/lib/plugins.orig/revert/lang/tr/lang.php
opt/app/dokuwiki/lib/plugins.orig/revert/lang/uk
opt/app/dokuwiki/lib/plugins.orig/revert/lang/uk/intro.txt
opt/app/dokuwiki/lib/plugins.orig/revert/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/revert/lang/vi
opt/app/dokuwiki/lib/plugins.orig/revert/lang/vi/intro.txt
opt/app/dokuwiki/lib/plugins.orig/revert/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/revert/lang/zh
opt/app/dokuwiki/lib/plugins.orig/revert/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/revert/lang/zh-tw/intro.txt
@ -2475,38 +2339,26 @@ opt/app/dokuwiki/lib/plugins.orig/styling
opt/app/dokuwiki/lib/plugins.orig/styling/.travis.yml
opt/app/dokuwiki/lib/plugins.orig/styling/README
opt/app/dokuwiki/lib/plugins.orig/styling/_test
opt/app/dokuwiki/lib/plugins.orig/styling/_test/colors.test.php
opt/app/dokuwiki/lib/plugins.orig/styling/_test/general.test.php
opt/app/dokuwiki/lib/plugins.orig/styling/action.php
opt/app/dokuwiki/lib/plugins.orig/styling/admin.php
opt/app/dokuwiki/lib/plugins.orig/styling/admin.svg
opt/app/dokuwiki/lib/plugins.orig/styling/iris.js
opt/app/dokuwiki/lib/plugins.orig/styling/lang
opt/app/dokuwiki/lib/plugins.orig/styling/lang/bg
opt/app/dokuwiki/lib/plugins.orig/styling/lang/bg/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/ca
opt/app/dokuwiki/lib/plugins.orig/styling/lang/ca/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/da
opt/app/dokuwiki/lib/plugins.orig/styling/lang/da/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/da/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de-informal
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de-informal/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de-informal/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/de/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/el
opt/app/dokuwiki/lib/plugins.orig/styling/lang/el/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/en
opt/app/dokuwiki/lib/plugins.orig/styling/lang/en/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/en/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/eo
opt/app/dokuwiki/lib/plugins.orig/styling/lang/eo/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/es
opt/app/dokuwiki/lib/plugins.orig/styling/lang/es/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/es/lang.php
@ -2537,29 +2389,16 @@ opt/app/dokuwiki/lib/plugins.orig/styling/lang/nl/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/no
opt/app/dokuwiki/lib/plugins.orig/styling/lang/no/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/no/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/oc
opt/app/dokuwiki/lib/plugins.orig/styling/lang/oc/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pl
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pl/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pl/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru
opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/sk
opt/app/dokuwiki/lib/plugins.orig/styling/lang/sk/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/sv
opt/app/dokuwiki/lib/plugins.orig/styling/lang/sv/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/uk
opt/app/dokuwiki/lib/plugins.orig/styling/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/vi
opt/app/dokuwiki/lib/plugins.orig/styling/lang/vi/intro.txt
opt/app/dokuwiki/lib/plugins.orig/styling/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh
opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh-tw/lang.php
@ -2575,12 +2414,6 @@ opt/app/dokuwiki/lib/plugins.orig/testing/_test
opt/app/dokuwiki/lib/plugins.orig/testing/_test/dummy_plugin_integration_test.test.php
opt/app/dokuwiki/lib/plugins.orig/testing/_test/dummy_plugin_test.test.php
opt/app/dokuwiki/lib/plugins.orig/testing/action.php
opt/app/dokuwiki/lib/plugins.orig/testing/conf
opt/app/dokuwiki/lib/plugins.orig/testing/conf/default.php
opt/app/dokuwiki/lib/plugins.orig/testing/conf/metadata.php
opt/app/dokuwiki/lib/plugins.orig/testing/lang
opt/app/dokuwiki/lib/plugins.orig/testing/lang/en
opt/app/dokuwiki/lib/plugins.orig/testing/lang/en/settings.php
opt/app/dokuwiki/lib/plugins.orig/testing/plugin.info.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager
opt/app/dokuwiki/lib/plugins.orig/usermanager/_test
@ -2859,14 +2692,10 @@ opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/no/import.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/no/intro.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/no/lang.php
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/no/list.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/oc
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/oc/lang.php
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/oc/list.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/add.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/delete.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/edit.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/import.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/intro.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/lang.php
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/pl/list.txt
@ -2958,14 +2787,6 @@ opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/uk/edit.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/uk/intro.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/uk/lang.php
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/uk/list.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/add.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/delete.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/edit.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/import.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/intro.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/lang.php
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/vi/list.txt
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/zh
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/zh-tw
opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/zh-tw/add.txt
@ -2999,6 +2820,7 @@ opt/app/dokuwiki/lib/scripts/hotkeys.js
opt/app/dokuwiki/lib/scripts/index.html
opt/app/dokuwiki/lib/scripts/index.js
opt/app/dokuwiki/lib/scripts/jquery
opt/app/dokuwiki/lib/scripts/jquery/jquery-migrate.min.js
opt/app/dokuwiki/lib/scripts/jquery/jquery-ui-theme
opt/app/dokuwiki/lib/scripts/jquery/jquery-ui-theme/images
opt/app/dokuwiki/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
@ -3024,7 +2846,6 @@ opt/app/dokuwiki/lib/scripts/media.js
opt/app/dokuwiki/lib/scripts/page.js
opt/app/dokuwiki/lib/scripts/qsearch.js
opt/app/dokuwiki/lib/scripts/script.js
opt/app/dokuwiki/lib/scripts/search.js
opt/app/dokuwiki/lib/scripts/textselection.js
opt/app/dokuwiki/lib/scripts/toolbar.js
opt/app/dokuwiki/lib/scripts/tree.js
@ -3051,7 +2872,7 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_media_fullscreen.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_media_popup.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_modal.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_recent.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_search.less
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_search.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_tabs.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_toc.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/basic.less
@ -3061,7 +2882,6 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/mobile.less
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/pagetools.less
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/print.css
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/structure.less
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/usertools.less
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/detail.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/images
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/images/apple-touch-icon.png
@ -3106,18 +2926,9 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cs/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/da
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/da/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/da/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de-informal
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de-informal/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de-informal/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/el
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/el/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/el/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/en
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/en/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/en/style.txt
@ -3151,27 +2962,14 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/nl/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/no
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/no/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/no/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/oc
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/oc/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pl
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pl/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pl/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt-br
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt-br/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt-br/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sk
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sk/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sv
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sv/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/vi
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/vi/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/vi/style.txt
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh/lang.php
opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh/style.txt
@ -3196,8 +2994,6 @@ opt/app/dokuwiki/vendor/composer/autoload_psr4.php
opt/app/dokuwiki/vendor/composer/autoload_real.php
opt/app/dokuwiki/vendor/composer/autoload_static.php
opt/app/dokuwiki/vendor/composer/installed.json
opt/app/dokuwiki/vendor/marcusschwarz/lesserphp/lessc.inc.php
opt/app/dokuwiki/vendor/openpsa/universalfeedcreator/lib/constants.php
opt/app/dokuwiki/vendor/paragonie/random_compat/lib/byte_safe_strings.php
opt/app/dokuwiki/vendor/paragonie/random_compat/lib/cast_to_int.php
opt/app/dokuwiki/vendor/paragonie/random_compat/lib/error_polyfill.php
@ -3217,9 +3013,7 @@ opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Archive.php
opt/app/dokuwiki/vendor/splitbrain/php-archive/src/FileInfo.php
opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Tar.php
opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Zip.php
opt/app/dokuwiki/vendor/splitbrain/php-cli/src/CLI.php
opt/app/local.php
opt/app/local.protected.php
opt/app/plugin
opt/app/plugin/README
opt/app/plugin/auth.php
@ -3270,7 +3064,6 @@ usr/lib/php/20151012/xmlreader.so
usr/lib/php/20151012/xmlwriter.so
usr/lib/php/20151012/xsl.so
usr/lib/ssl/openssl.cnf
usr/lib/x86_64-linux-gnu/gconv/IBM437.so
usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
usr/lib/x86_64-linux-gnu/libGeoIP.so.1
usr/lib/x86_64-linux-gnu/libX11.so.6
@ -3463,7 +3256,6 @@ usr/share/zoneinfo/America/Montserrat
usr/share/zoneinfo/America/New_York
usr/share/zoneinfo/America/Noronha
usr/share/zoneinfo/America/North_Dakota
usr/share/zoneinfo/America/Nuuk
usr/share/zoneinfo/America/Panama
usr/share/zoneinfo/America/Phoenix
usr/share/zoneinfo/America/Port_of_Spain

View File

@ -9,7 +9,7 @@ const pkgdef :Spk.PackageDefinition = (
# The package definition. Note that the spk tool looks specifically for the
# "pkgdef" constant.
id = "nx3dqcmz2sjjz939vkg4847vvxrzqsatqfjrt3ea50z3jac5kv7h",
id = "s97k5f7mkzjtz6nn440cm2dyv5ay4p3aqaxumhp1mv2s5k35cfah",
# Your app ID is actually its public key. The private key was placed in
# your keyring. All updates must be signed with the same key.
@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "DokuWiki"),
appVersion = 10, # Increment this for every release.
appVersion = 7, # Increment this for every release.
appMarketingVersion = (defaultText = (embed "app-marketing-version")),
appMarketingVersion = (defaultText = "2017-02-19g~2020-06-13"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
@ -57,7 +57,7 @@ const pkgdef :Spk.PackageDefinition = (
website = "http://dokuwiki.org",
# This should be the app's main website url.
codeUrl = "https://github.com/johnbintz/dokuwiki-sandstorm",
codeUrl = "https://github.com/ndarilek/dokuwiki-sandstorm",
# URL of the app's source code repository, e.g. a GitHub URL.
# Required if you specify a license requiring redistributing code, but optional otherwise.
@ -73,7 +73,7 @@ const pkgdef :Spk.PackageDefinition = (
author = (
# Fields relating to the author of this app.
contactEmail = "sandstorm@leapingsheepfarm.com",
contactEmail = "nolan@thewordnerd.info",
# Email address to contact for any issues with this app. This includes end-user support
# requests as well as app store administrator requests, so it is very important that this be a
# valid address with someone paying attention to it.

View File

@ -1,7 +1,5 @@
# DokuWiki Sandstorm
_Use [this fork](https://github.com/ocdtrekkie/dokuwiki-sandstorm) of the project instead!_
Run [DokuWiki](https://www.dokuwiki.org/dokuwiki) on [Sandstorm](https://sandstorm.io/).
A lightweight wiki for your personal use.
@ -10,43 +8,18 @@ A lightweight wiki for your personal use.
* Runs in PHP 7 using PHP-FPM and an Nginx reverse proxy
* Uses Sandstorm authentication
### Sandstorm Upgrades
_(last updated 2020-09-01)_
The version in the app store is far behind the current releases of
DokuWiki. In order to minimize the amount of hassle with getting Sandstorm's
DokuWiki up to date with modern DokuWiki, new releases will be rolled out every
two or so weeks, giving existing Sandstorm users enough time to clean up
potentially conflicting plugins and other modifications, which will cause the
most issues when upgrading.
The release plan follows the recommended versions as shown on
the [Download DokuWiki](https://download.dokuwiki.org/) page,
and will be updated as new releases are available in the [App Store](https://apps.sandstorm.io/).
* Previous: 2017-02-19b
* Previous: 2017-02-19g (old stable)
* [Currently in App Store](https://apps.sandstorm.io/app/nx3dqcmz2sjjz939vkg4847vvxrzqsatqfjrt3ea50z3jac5kv7h): 2018-04-22c (stable)
* Next: 2020-07-29 (recommended version)
Once 2020-07-29 has been in the App Store for a few weeks, this section of the
README will be removed and updates will happen normally.
## Troubleshooting
### PHP errors in the page, especially after upgrades
### PHP errors in the page
You may have a plugin that needs to be upgraded or disabled.
See if the script referenced in the error is in `plugins`.
* Try to disable or remove the plugin from the admin UI.
* If you can't disable/remove the plugin via the admin:
1. Download a backup of the grain
2. Unzip the backup into a new folder
3. Remove the plugin folder from the unzipped backup tree
4. Rezip up the backup tree, preserving the same base folders
5. Restore the grain from backup
* See if the script referenced in the error is in `plugins`. You may have a
plugin that needs to be upgraded or disabled.
* If you can't disable/remove the plugin via the UI:
1. Download a backup of the grain
2. Unzip the backup into a new folder
3. Remove the plugin folder from the unzipped backup tree
4. Rezip up the backup tree, preserving the same base folders
5. Restore the grain from backup
## Building a new version
@ -63,5 +36,5 @@ See if the script referenced in the error is in `plugins`.
git submodule init
git submodule update
bin/upgrade_dokuwiki <target git tag from https://github.com/splitbrain/dokuwiki>
# follow the directions echoed from the script
# follow the directions printed from the script
```

View File

@ -1,50 +1,22 @@
#!/usr/bin/env ruby
require 'time'
system("bin/cleanup_dokuwiki")
tag = ARGV[0]
unless tag
puts "Usage: #{$0} <tag>"
#!/bin/bash
bin/cleanup_dokuwiki
cd dokuwiki
git fetch
git checkout $1
if [ $? -ne 0 ]; then
echo "Tag not found!"
exit 1
end
fi
Dir.chdir "dokuwiki" do
system("git fetch")
system("git checkout #{tag}")
cd ..
if $? != 0
puts "Tag not found!"
exit 1
end
end
puts "#{tag} exists, updating files"
today = Time.now.strftime('%Y-%m-%d')
version = tag.gsub(/^release_(stable|candidate)_/, '')
File.open('.sandstorm/app-marketing-version', 'w') { |fh| fh.puts "#{version}~#{today}" }
lines = File.readlines('.sandstorm/sandstorm-pkgdef.capnp')
lines = lines.map do |line|
next line unless line['appVersion']
line.gsub(/= ([0-9]+),/) { |m| "= #{$1.to_i + 1}," }
end
File.open('.sandstorm/sandstorm-pkgdef.capnp', 'w') { |fh| fh.print lines.join }
puts "Now:"
puts
puts "vagrant-spk vm destroy"
puts "vagrant-spk vm up"
puts "vagrant-spk dev to Test locally"
puts "vagrant-spk pack ../dokuwiki-sandstorm-#{version}.pkg"
puts "Test upgrade"
puts "vagrant-spk publish ../dokuwiki-sandstorm-#{version}.pkg"
echo "Now:"
echo
echo "vagrant-spk vm destroy"
echo "vagrant-spk vm up"
echo "Test locally"
echo "vagrant-spk pack ../dokuwiki-sandstorm-$1.pkg"
echo "Test upgrade"
echo "vagrant-spk publish ../dokuwiki-sandstorm-$1.pkg"

@ -1 +1 @@
Subproject commit 096f04eff7aad873454dc31dfd0c594ceaa5b3af
Subproject commit a5690a8c536c2fc9bdb8871714c9978ea2c19c98

View File

@ -9,3 +9,13 @@
*/
$conf['showuseras'] = 'username';
$conf['useacl'] = 1; //Use Access Control Lists to restrict access?
$conf['autopasswd'] = 0; //autogenerate passwords and email them to user
$conf['authtype'] = 'sandstorm'; //which authentication backend should be used
$conf['superuser'] = '@admin'; //The admin can be user or @group or comma separated list user1,@group1,user2
$conf['manager'] = '@manager'; //The manager can be user or @group or comma separated list user1,@group1,user2
$conf['profileconfirm'] = 0; //Require current password to confirm changes to user profile
$conf['disableactions']='login';
$conf['userewrite'] = 1; //this makes nice URLs: 0: off 1: .htaccess 2: internal
$conf['useslash'] = 1; //use slash instead of colon? only when rewrite is on
$conf['savedir'] = '/var/lib/dokuwiki/data'; //where to store all the files

View File

@ -1,21 +0,0 @@
<?php
/**
* This is an example of how a local.php could look like.
* Simply copy the options you want to change from dokuwiki.php
* to this file and change them.
*
* When using the installer, a correct local.php file be generated for
* you automatically.
*/
$conf['autopasswd'] = 0; //autogenerate passwords and email them to user
$conf['authtype'] = 'sandstorm'; //which authentication backend should be used
$conf['superuser'] = '@admin'; //The admin can be user or @group or comma separated list user1,@group1,user2
$conf['manager'] = '@manager'; //The manager can be user or @group or comma separated list user1,@group1,user2
$conf['profileconfirm'] = 0; //Require current password to confirm changes to user profile
$conf['disableactions']='login';
$conf['userewrite'] = 1; //this makes nice URLs: 0: off 1: .htaccess 2: internal
$conf['useslash'] = 1; //use slash instead of colon? only when rewrite is on
$conf['useacl'] = 1; //Use Access Control Lists to restrict access?
$conf['savedir'] = '/var/lib/dokuwiki/data'; //where to store all the files
$conf['target']['extern'] = '_blank'; // always open external links in a new window