| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | $wgLDAPUseFetchedUsername = array(); |
| 92 | 92 | $wgPasswordResetRoutes['domain'] = true; |
| 93 | 93 | |
| 94 | | -define( "LDAPAUTHVERSION", "1.2g" ); |
| | 94 | +define( "LDAPAUTHVERSION", "1.2h" ); |
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | 97 | * Add extension information to Special:Version |
| — | — | @@ -440,7 +440,7 @@ |
| 441 | 441 | * @param UserLoginTemplate $template |
| 442 | 442 | * @access public |
| 443 | 443 | */ |
| 444 | | - function modifyUITemplate( &$template ) { |
| | 444 | + function modifyUITemplate( &$template, &$type ) { |
| 445 | 445 | global $wgLDAPAddLDAPUsers; |
| 446 | 446 | global $wgLDAPMailPassword; |
| 447 | 447 | |
| — | — | @@ -508,7 +508,7 @@ |
| 509 | 509 | * @return bool |
| 510 | 510 | * @access public |
| 511 | 511 | */ |
| 512 | | - function setPassword( $user, &$password ) { |
| | 512 | + function setPassword( $user, $password ) { |
| 513 | 513 | global $wgLDAPUpdateLDAP, $wgLDAPWriterDN, $wgLDAPWriterPassword; |
| 514 | 514 | |
| 515 | 515 | $this->printDebug( "Entering setPassword", NONSENSITIVE ); |
| — | — | @@ -691,7 +691,7 @@ |
| 692 | 692 | * @return bool |
| 693 | 693 | * @access public |
| 694 | 694 | */ |
| 695 | | - function addUser( $user, $password ) { |
| | 695 | + function addUser( $user, $password, $email = '', $realname = '' ) { |
| 696 | 696 | global $wgLDAPAddLDAPUsers, $wgLDAPWriterDN, $wgLDAPWriterPassword; |
| 697 | 697 | global $wgLDAPSearchAttributes; |
| 698 | 698 | global $wgLDAPWriteLocation; |
| — | — | @@ -913,7 +913,7 @@ |
| 914 | 914 | * @access public |
| 915 | 915 | * TODO: fix setExternalID stuff |
| 916 | 916 | */ |
| 917 | | - function initUser( &$user ) { |
| | 917 | + function initUser( &$user, $autocreate = false ) { |
| 918 | 918 | $this->printDebug( "Entering initUser", NONSENSITIVE ); |
| 919 | 919 | |
| 920 | 920 | if ( $this->authFailed ) { |