diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-10-06 10:46:10 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-10-06 10:46:10 +0200 |
| commit | 93a7873eb0646b5712d75b031cd8b8b143968ba2 (patch) | |
| tree | a97bf3309c75947475a42a73f23727f7d2642677 /lib/scripts/fileuploader.js | |
| parent | 2ca4ac4d5e2214a945489b6aa66c9542b3ee2e4a (diff) | |
| parent | f4476bd9b5badd36cd0617d76538e47d9649986b (diff) | |
| download | rpg-93a7873eb0646b5712d75b031cd8b8b143968ba2.tar.gz rpg-93a7873eb0646b5712d75b031cd8b8b143968ba2.tar.bz2 | |
Merge remote-tracking branch 'janschumann/master' into future
This merge fixes all conflicts but is otherwise untested and might break
funktionality in the auth system somewhere. It NEEDS MAJOR TESTING!
Some refactoring of the auth plugins is still needed:
* move to PHP5 style
* fix comments
* add plugin.info.txt
* janschumann/master:
Refactored auth system: All auth methods are now introduced as plugins.
Bugfix: auth types are now correcty added
Setup auth system from plugins
Added Auth-Plugin-Prototype to autoload
Load auth types from plugins in settings_authtype class
Added prototype for Auth-Plugins
added plugin type 'auth'
Conflicts:
inc/auth.php
inc/auth/pgsql.class.php
inc/init.php
inc/load.php
lib/plugins/auth.php
lib/plugins/authad/auth.php
lib/plugins/authldap/auth.php
lib/plugins/authmysql/auth.php
lib/plugins/authplain/auth.php
Diffstat (limited to 'lib/scripts/fileuploader.js')
0 files changed, 0 insertions, 0 deletions