translation update

Update de, de-informal

fix php errors

remove unnecessary "public"

sort plugins in plugin_list()

Revert "eliminate access to global $plugin_controller"

This reverts commit 2b1bb8ffafe5d72c35b81659b1d96b8dc19f0de3.

Revert "sort plugins in Config Manager"

This reverts commit d2a8ea656a16abfd37fe4ffb58d1cf7e4ddf2e15.

translation update

Update template.php

Kind of applied given suggestion but switched $fallback to boolean to reduce possible values.

Update composer dependencies

The following dependencies have been updated:

splitbrain/php-archive (1.0.10 => 1.1.1)
phpseclib/phpseclib (2.0.11 => 2.0.23)
paragonie/random_compat (v2.0.12 => v2.0.1

Update composer dependencies

The following dependencies have been updated:

splitbrain/php-archive (1.0.10 => 1.1.1)
phpseclib/phpseclib (2.0.11 => 2.0.23)
paragonie/random_compat (v2.0.12 => v2.0.18)
simplepie/simplepie (1.5.1 => 1.5.3)
geshi/geshi (v1.0.9.0 => v1.0.9.1)
openpsa/universalfeedcreator (v1.8.3 => v1.8.3.2):
marcusschwarz/lesserphp
splitbrain/php-cli (1.1.2 => 1.1.5)

show more ...

clarified trustedproxy setting

Added "Date of New Revision" text in notification email

reduce noises in email and provide stronger indication of time dependent version. Thanks @Klap-in!

Update template.php

Here is a solution attempt, sorry for the long delay.
According to my tests, absolute path isn't required

Improve tpl_getMediaFile()

Previously, if no candidate is found, the result would still always be last candidate url even if it doesn't exist (and function would trigger a Warning for trying to geti

Improve tpl_getMediaFile()

Previously, if no candidate is found, the result would still always be last candidate url even if it doesn't exist (and function would trigger a Warning for trying to getimagesize() on a file that doesn't exist)

show more ...

eliminate access to global $plugin_controller

sort plugins in Config Manager

clientIP: modify test to assume trusted proxy be included in IP array

clientIP: add trustedproxy, return first untrusted IP instead of the last one

This fixes #2828, where malicious clients passed in customized HTTP header to keep its IP address off records.

This is

clientIP: add trustedproxy, return first untrusted IP instead of the last one

This fixes #2828, where malicious clients passed in customized HTTP header to keep its IP address off records.

This is inspired by Sympony's Request::setTrustedProxies, but I don't want to implement everything including IP CIDR matching (IPv4 + IPv6), so I decided to reuse the local IP checker in place powered by regexp. Now admins can customize this "local" (trusted) proxy list using $conf['trustedproxy'], and by default it will allow any local IPs.

If in the future there is a need to implement array-based CIDR matching, $conf['trustedproxies'] can be used for the new config name.

show more ...

clientIP: Add tests addressing #2828

We cannot trust any IP not included in $conf['trustedproxy'].

getGoogleQuery: add tests

getGoogleQuery: remove legacy code for PHP 5.3

https://bugs.php.net/bug.php?id=49733 while we have 5.6+ minimum

getGoogleQuery: ignore if query includes a full URL

We don't want to split the URL to highlight the "query", especially when q is the URL of the page itself - e.g. Google Form's redirect https://www

getGoogleQuery: ignore if query includes a full URL

We don't want to split the URL to highlight the "query", especially when q is the URL of the page itself - e.g. Google Form's redirect https://www.google.com/url

This will also ignore queries like `syntax site:https://www.dokuwiki.org` but it should be fine. Just don't want to use a full parser here.

This fixes #2848.

show more ...

Include rev_id in new revision link in notification email

Older versions have a "This is an old revision of the document!" message on the top of the page. By including rev_id, user can always see th

Include rev_id in new revision link in notification email

Older versions have a "This is an old revision of the document!" message on the top of the page. By including rev_id, user can always see the version the email is referring to, while knowing if it is the latest version by looking at the wiki page.

A hint about this is also added to email text.

This fixes #2196.

show more ...

Add "default" keyword support for interwiki links

Thank you @selfthinker for the suggestion!

If nothing is found in default, it will still fall back to "". Test is added as well.

Meantime I fixed

Add "default" keyword support for interwiki links

Thank you @selfthinker for the suggestion!

If nothing is found in default, it will still fall back to "". Test is added as well.

Meantime I fixed a problem that Scrutinizer complained about.

show more ...

Remove Google Lucky for non-existing interwiki links

For compatibility renderer will return string '' of $shortcut and $url instead of NULL when seeing a non-existing interwiki link. In the meantime

Remove Google Lucky for non-existing interwiki links

For compatibility renderer will return string '' of $shortcut and $url instead of NULL when seeing a non-existing interwiki link. In the meantime, media and link output in xhtml renderer is adjusted, to show title text instead when src/href is null. In interwiki case, the title will be the "reference" part of the interwiki link.

This makes it possible to also support no URL cases in `interwiki.conf`. Before it will output a URL as `rawurlencode($reference)`, which doesn't make too much sense since it's encoded. However, I am not sure the use case under the current behavior (no URL, but text as `$reference`).

Docs needs to be added to warn renderer plugin developers of this situation.

This fixes #2588.

show more ...

css_compress: quote placeholder to simply quote protection

There are two ways of doing this:

1. "doku" > STR1 > "doku"
2. "doku" > "1" > "doku"

#1 is what I did before. I did replace STRN with a n

css_compress: quote placeholder to simply quote protection

There are two ways of doing this:

1. "doku" > STR1 > "doku"
2. "doku" > "1" > "doku"

#1 is what I did before. I did replace STRN with a new placeholder in the previous implementation so that there is no conflict. However #2 is more elegant, so this commit implements it.

Test is updated to address splitbrain's concern about placeholder string in the original text.

show more ...