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
No related branches found
No related tags found
Showing
- inc/auth.php 20 additions, 22 deletionsinc/auth.php
- inc/auth/pgsql.class.php 0 additions, 419 deletionsinc/auth/pgsql.class.php
- inc/init.php 1 addition, 1 deletioninc/init.php
- inc/load.php 2 additions, 1 deletioninc/load.php
- lib/plugins/auth.php 25 additions, 3 deletionslib/plugins/auth.php
- lib/plugins/authad/auth.php 9 additions, 5 deletionslib/plugins/authad/auth.php
- lib/plugins/authad/plugin.info.txt 7 additions, 0 deletionslib/plugins/authad/plugin.info.txt
- lib/plugins/authldap/auth.php 5 additions, 4 deletionslib/plugins/authldap/auth.php
- lib/plugins/authldap/plugin.info.txt 7 additions, 0 deletionslib/plugins/authldap/plugin.info.txt
- lib/plugins/authmysql/auth.php 5 additions, 5 deletionslib/plugins/authmysql/auth.php
- lib/plugins/authmysql/plugin.info.txt 7 additions, 0 deletionslib/plugins/authmysql/plugin.info.txt
- lib/plugins/authpgsql/auth.php 331 additions, 0 deletionslib/plugins/authpgsql/auth.php
- lib/plugins/authpgsql/plugin.info.txt 7 additions, 0 deletionslib/plugins/authpgsql/plugin.info.txt
- lib/plugins/authplain/auth.php 6 additions, 6 deletionslib/plugins/authplain/auth.php
- lib/plugins/authplain/plugin.info.txt 7 additions, 0 deletionslib/plugins/authplain/plugin.info.txt
- lib/plugins/config/settings/extra.class.php 44 additions, 7 deletionslib/plugins/config/settings/extra.class.php
Loading
Please register or sign in to comment