| Index: trunk/phase3/includes/ExternalUser.php |
| — | — | @@ -43,8 +43,7 @@ |
| 44 | 44 | if ( is_null( $wgExternalAuthType ) ) { |
| 45 | 45 | return false; |
| 46 | 46 | } |
| 47 | | - $class = "ExternalUser_$wgExternalAuthType"; |
| 48 | | - $obj = new $class; |
| | 47 | + $obj = new $wgExternalAuthType; |
| 49 | 48 | if ( !$obj->initFromName( $name ) ) { |
| 50 | 49 | return false; |
| 51 | 50 | } |
| — | — | @@ -60,8 +59,7 @@ |
| 61 | 60 | if ( is_null( $wgExternalAuthType ) ) { |
| 62 | 61 | return false; |
| 63 | 62 | } |
| 64 | | - $class = "ExternalUser_$wgExternalAuthType"; |
| 65 | | - $obj = new $class; |
| | 63 | + $obj = new $wgExternalAuthType; |
| 66 | 64 | if ( !$obj->initFromId( $id ) ) { |
| 67 | 65 | return false; |
| 68 | 66 | } |
| — | — | @@ -77,8 +75,7 @@ |
| 78 | 76 | if ( is_null( $wgExternalAuthType ) ) { |
| 79 | 77 | return false; |
| 80 | 78 | } |
| 81 | | - $class = "ExternalUser_$wgExternalAuthType"; |
| 82 | | - $obj = new $class; |
| | 79 | + $obj = new $wgExternalAuthType; |
| 83 | 80 | if ( !$obj->initFromCookie( $cookie ) ) { |
| 84 | 81 | return false; |
| 85 | 82 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4148,8 +4148,8 @@ |
| 4149 | 4149 | * be specified. |
| 4150 | 4150 | * |
| 4151 | 4151 | * null indicates no external authentication is to be used. Otherwise, |
| 4152 | | - * "ExternalUser_$wgExternalAuthType" must be the name of a non-abstract class |
| 4153 | | - * that extends ExternalUser. |
| | 4152 | + * $wgExternalAuthType must be the name of a non-abstract class that extends |
| | 4153 | + * ExternalUser. |
| 4154 | 4154 | * |
| 4155 | 4155 | * Core authentication modules can be found in includes/extauth/. |
| 4156 | 4156 | */ |
| Index: trunk/phase3/includes/extauth/Hardcoded.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | * This class supports external authentication from a literal array dumped in |
| 23 | 23 | * LocalSettings.php. It's mostly useful for testing. Example configuration: |
| 24 | 24 | * |
| 25 | | - * $wgExternalAuthType = 'Hardcoded'; |
| | 25 | + * $wgExternalAuthType = 'ExternalUser_Hardcoded'; |
| 26 | 26 | * $wgExternalAuthConf = array( |
| 27 | 27 | * 'Bob Smith' => array( |
| 28 | 28 | * 'password' => 'literal string', |
| Index: trunk/phase3/includes/extauth/MediaWiki.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | * This class supports authentication against an external MediaWiki database, |
| 23 | 23 | * probably any version back to 1.5 or something. Example configuration: |
| 24 | 24 | * |
| 25 | | - * $wgExternalAuthType = 'MediaWiki'; |
| | 25 | + * $wgExternalAuthType = 'ExternalUser_MediaWiki'; |
| 26 | 26 | * $wgExternalAuthConf = array( |
| 27 | 27 | * 'DBtype' => 'mysql', |
| 28 | 28 | * 'DBserver' => 'localhost', |
| Index: trunk/phase3/includes/extauth/vB.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | * code, only reads from the database. Example lines to put in |
| 25 | 25 | * LocalSettings.php: |
| 26 | 26 | * |
| 27 | | - * $wgExternalAuthType = 'vB'; |
| | 27 | + * $wgExternalAuthType = 'ExternalUser_vB'; |
| 28 | 28 | * $wgExternalAuthConf = array( |
| 29 | 29 | * 'server' => 'localhost', |
| 30 | 30 | * 'username' => 'forum', |