fixed group wildcards and added tests

removed another occurance of the obsolete config option

simplified %GROUP% wildcard support

Merge branch 'master' of git://github.com/Aorimn/dokuwiki into pull-request-76

* 'master' of git://github.com/Aorimn/dokuwiki:
Change default groupwildcards option to 0 not to change behavior of

Merge branch 'master' of git://github.com/Aorimn/dokuwiki into pull-request-76

* 'master' of git://github.com/Aorimn/dokuwiki:
Change default groupwildcards option to 0 not to change behavior of
Added support for the %GROUP% wildcard.

Conflicts:
inc/auth.php

show more ...

some code cleanup and php docs

Input wrapper for auth.php

code cleanup

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they s

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...

Conflicts:
inc/auth.php
inc/load.php

show more ...

Merge branch 'master' of https://github.com/dom-mel/dokuwiki into pull-request-87

* 'master' of https://github.com/dom-mel/dokuwiki: (38 commits)
removed requires, changed conf check in xmlrpc.php

Merge branch 'master' of https://github.com/dom-mel/dokuwiki into pull-request-87

* 'master' of https://github.com/dom-mel/dokuwiki: (38 commits)
removed requires, changed conf check in xmlrpc.php
removed require_once for autoloaded fulltext.php
updated comment
added dokuwiki.getXMLRPCAPIVersion and wiki.getRPCVersionSupported
added RPC_CALL_ADD event.
replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function
changed error code for unauthorized method calls.
typo fixes
moved plugin and core method calls to seperate function
corrected comment
added getapi methods to remote plugin
removed unused class
fixed testcase
refactored RemoteAccessDenied to RemoteAccessDeniedException
adjusted test cases
delegate file and date transformation to remote library
treat null as empty array
added missing getTime
added missing getVersion
set login as public method
...

show more ...

coding style updates

Merge branch 'master' of https://github.com/splitbrain/dokuwiki

Conflicts:
lib/exe/xmlrpc.php

Merge branch 'resetpassword'

No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.

* resetpassword:
added a timeli

Merge branch 'resetpassword'

No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.

* resetpassword:
added a timelimit for password reset tokens
removed commented line
use correct lang string for password mismatch
removed outdated language string. it has to be retranslated
German translation for password reset
honor autopasswd setting for resend password

Conflicts:
inc/lang/no/lang.php
inc/lang/sl/lang.php

show more ...

Refactored auth system: All auth methods are now introduced as plugins.

added a timelimit for password reset tokens

passwords now need to be reset within 3 days of requesting the password
change mail

use correct lang string for password mismatch

Added support for the %GROUP% wildcard.

%GROUP% is the same as %USER% except it's done on each group a user is
in.
%USER% and %GROUP% cannot be mixed on an ACL line.

Setup auth system from plugins

use in_array to filter groups instead of preg_grep for acl

the usage of preg_grep can result in "regular expression is too large"
warnings, which leads to errors in auth_aclcheck.

Merge branch 'master' of github.com:dom-mel/dokuwiki

Replaced mail_send calls with new Mailer class

Use mailprefix also for registration and resend password notification mails (FS#2366)

honor autopasswd setting for resend password

When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.

Note to

honor autopasswd setting for resend password

When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.

Note to translators: the wording for btn_resendpwd and resendpwd changed
to be more universal. English and German language files where updated -
other languages need to be adjusted.

Conflicts:

inc/lang/en/lang.php

show more ...

use correct phpdoc @return tag.

Merge pull request #19 from gbirke/master

Make cookie path configurable

stay logged in when updating your password

This functionality broke in recent updates to the cookie handling. This
patch makes it work again.
Binding to the session is now a functionality of auth_co

stay logged in when updating your password

This functionality broke in recent updates to the cookie handling. This
patch makes it work again.
Binding to the session is now a functionality of auth_cookiesalt()

show more ...