Commit Graph

9795 Commits

Author SHA1 Message Date
Guy Brand 504b44a4c7 Hotfix Release 2018-04-22c "Greebo" 2020-05-01 12:38:20 +02:00
Andreas Gohr f47f9aaf20 properly encode signature code
This addresses the XSS vulnerability mentioned in #3044
2020-05-01 12:36:29 +02:00
Guy Brand 4e34491f07 Hotfix Release 2018-04-22b "Greebo" 2019-01-06 10:18:47 +01:00
Michael Hamann 45dff935b8 Security: Fix ACL check in search_allpages
Due to the changes in 8f34cf3d32, the ACL
check in search_allpages was only executed when 'skipacl' has been
explicitly set to false. Otherwise, only ACLs for namespaces were
checked (unless the sneakyacl option was passed). The documentation
states that the default for 'skipacl' is false, so setting it to false
shouldn't be necessary.

From all I can see, this does not concern DokuWiki itself as
search_allpages is never used without the 'skipacl' option explicitly
set to true or false. However, this causes serious security issues in
plugins that rely on this ACL check in search_allpages like the include
plugin.
2019-01-06 10:17:13 +01:00
Andreas Gohr c5cd7bf4f4 continue is break in switch
This should fix a warning in PHP 7.3
2019-01-06 10:14:01 +01:00
Guy Brand 879d2b08ea Hotfix release 2018-04-22a "Greebo" 2018-05-03 08:36:13 +02:00
Guy Brand c5a85f9e06 Merge branch 'master' into stable 2018-05-03 08:31:31 +02:00
Andreas Gohr 1362c8af98 fix draft recovering
The actual draft text got lost when we changed to showing the diff
instead of the full draft.
2018-05-02 20:29:50 +02:00
Andreas Gohr a3965d035f
Merge pull request #2342 from ivanovich/patch-1
Add simple catch-all to left install.php div
2018-05-02 11:09:18 +02:00
Andreas Gohr ddb94cf031 updated php-archive lib. fixes #2361 2018-05-01 10:11:03 +02:00
Gerrit Uitslag 10bf5c9334
Merge pull request #2363 from dokuwiki-translate/lang_update_837_1525104066
Translation update (ka)
2018-04-30 18:27:20 +02:00
Tengiz d4e34dc04f translation update 2018-04-30 18:05:23 +02:00
Gerrit Uitslag f4c7bdbe9b
typo 2018-04-30 14:10:42 +02:00
Andreas Gohr 306daa1041 link to avanced geshi options. fixes #2352 2018-04-30 12:40:19 +02:00
Andreas Gohr 2c3162696a
Merge pull request #2354 from splitbrain/unlock
unlock pages on viewing them
2018-04-28 12:36:35 +02:00
Andreas Gohr 1ffed7fb80
Merge pull request #2350 from splitbrain/resendpwdfix
add user interface back to resendpwd action. fixes #2349
2018-04-28 12:36:14 +02:00
Andreas Gohr a628a7c68b phpseclib update 2018-04-27 13:42:00 +02:00
Andreas Gohr 5e383ee0f1
Merge pull request #2356 from splitbrain/simpleQueryPagenames
improve search as a primary means to create new pages
2018-04-27 11:32:46 +02:00
Michael Große 42690e4d38
feat: improve search as a primary means to create new pages
Specifically, this pull request checks if the current query is already a
valid pageid and then return that as suggested pageid.

Also, tests are added for this method.

Fixes #2355

PS: We may want to somehow better educate/nudge users to use the better
way of creating pages by creating links on existing pages.
2018-04-27 10:46:19 +02:00
Andreas Gohr 3f5c3c1e89 unlock in cancel action
and actually use it in the edit form.
2018-04-27 08:41:12 +02:00
Andreas Gohr daa5910cfb unlock pages on viewing them 2018-04-26 19:02:42 +02:00
Phy 0d5c154037
Merge pull request #2351 from dokuwiki-translate/lang_update_824_1524670245
Translation update (cs)
2018-04-26 00:13:24 +08:00
Jonáš Dyba 6e19c6eca4 translation update 2018-04-25 17:36:24 +02:00
Andreas Gohr 4347c5bb1f add user interface back to resendpwd action. fixes #2349 2018-04-25 14:39:56 +02:00
Andreas Gohr 7a2061bbef
Merge pull request #2346 from phallobst/typo-fix
Typo fix
2018-04-24 19:46:21 +02:00
phallobst d23366ba2b
Missing quote 2018-04-24 19:08:34 +02:00
phallobst f14bca3959
Missing quote 2018-04-24 19:08:00 +02:00
Andreas Gohr fccdd27a95
Merge pull request #2343 from dokuwiki-translate/lang_update_821_1524568935
Translation update (nl)
2018-04-24 13:30:51 +02:00
Harriet Neitz 110353d928 translation update 2018-04-24 13:26:45 +02:00
L. Ivanovich Harrison 7ac1baa005
Add simple catch-all to left install.php div
Background: I was trying to install DokuWiki in my chrooted OpenBSD webserver. The install seemed funky (generated config but not ACLs), and the installer page, instead of even showing any errors, was just blank after submitting initial parameters. Long story short, I edited install.php to approximately this effect, and finally got a visible error, which let me find out that I needed to create $CHROOT/dev/{a,u,s,}random. I would have found that out a lot sooner and torn out a lot less of my beautiful hair if something like this were already in place. After all, the installation phase is where one expects many edge cases and whatnot. Would help newcomers with strange environments to make more actionable forum posts crying for help. Please consider.
2018-04-24 02:35:41 -07:00
Phy ed948f0f48
Merge pull request #2335 from dokuwiki-translate/lang_update_817_1524494830
Translation update (fr)
2018-04-24 00:46:18 +08:00
Phy 5c6bc3f8cc
Merge pull request #2338 from dokuwiki-translate/lang_update_819_1524497641
Translation update (it)
2018-04-24 00:05:04 +08:00
damiano 3877cbc858 translation update 2018-04-23 17:36:41 +02:00
Phy 476e9cb553
Merge pull request #2336 from dokuwiki-translate/lang_update_818_1524496314
Translation update (de)
2018-04-23 23:27:17 +08:00
Karl_de_Hall 058bdf683c translation update 2018-04-23 17:16:25 +02:00
Damien Regad 3fc5af51b7 translation update 2018-04-23 16:51:21 +02:00
Andreas Gohr 5edc15428f
Merge pull request #2329 from splitbrain/fixStartpageYouAreHere
print 'you are here' again for startpages
2018-04-23 15:25:50 +02:00
Andreas Gohr db5f32b064
Merge pull request #2332 from splitbrain/removeStyleIniCall
Replace old call to css_styleini
2018-04-23 15:24:54 +02:00
Michael Große 65030737b7
fix: replace old call to css_styleini
fixes #2330
2018-04-23 13:45:25 +02:00
Andreas Gohr 5d59b41083
Merge pull request #2331 from dokuwiki-translate/lang_update_813_1524472486
Translation update (ru)
2018-04-23 13:31:04 +02:00
Yuriy Skalko 03914b1099 translation update 2018-04-23 10:36:19 +02:00
Michael Große a8c33ded53
fix: print 'you are here' again for startpages
This bug was introduced in #2251
c4a386f17d

Fixes #2325
2018-04-23 08:17:26 +02:00
Guy Brand d0fffb7922 Release 2018-04-22 "Greebo" 2018-04-22 13:17:57 +02:00
Guy Brand a08ab6e8bb Merge branch 'master' into stable 2018-04-22 13:15:03 +02:00
Guy Brand 8ca3665ea1 Release preparation 2018-04-22 13:14:09 +02:00
Andreas Gohr 6273596f37
Merge pull request #2323 from splitbrain/recenttypefix
Honor type setting for recent changes. fixes #2322
2018-04-20 17:54:22 +02:00
Phy 8b05b1f0c2
Merge pull request #2324 from dokuwiki-translate/lang_update_811_1524231868
Translation update (fr)
2018-04-20 22:46:20 +08:00
Schplurtz le Déboulonné 8591ce1627 translation update 2018-04-20 15:46:37 +02:00
Andreas Gohr e009a94f2a Honor type setting for recent changes. fixes #2322 2018-04-20 12:28:32 +02:00
Andreas Gohr 6ea61f3919
Merge pull request #2314 from splitbrain/fix-html
Fix invalid HTML
2018-04-20 11:59:18 +02:00