More convenient format for $wgExternalAuthType

Now is the whole class name, not a suffix.  This allows you to do things
like $wgExternalAuthType::someStaticMethod() instead of having to fiddle
with temporary variables.

This will obviously break anything that has $wgExternalAuthType already
configured, so if that's anyone but me, make sure to fix your configs.
This is still experimental.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ee0b959..c559897 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4148,8 +4148,8 @@ $wgPoolCounterConf = null;
  * be specified.
  *
  * null indicates no external authentication is to be used.  Otherwise,
- * "ExternalUser_$wgExternalAuthType" must be the name of a non-abstract class
- * that extends ExternalUser.
+ * $wgExternalAuthType must be the name of a non-abstract class that extends
+ * ExternalUser.
  *
  * Core authentication modules can be found in includes/extauth/.
  */

diff --git a/includes/ExternalUser.php b/includes/ExternalUser.php
index 94349c9..09a8d97 100644 (file)
--- a/includes/ExternalUser.php
+++ b/includes/ExternalUser.php
@@ -43,8 +43,7 @@ abstract class ExternalUser {
                if ( is_null( $wgExternalAuthType ) ) {
                        return false;
                }
-               $class = "ExternalUser_$wgExternalAuthType";
-               $obj = new $class;
+               $obj = new $wgExternalAuthType;
                if ( !$obj->initFromName( $name ) ) {
                        return false;
                }
@@ -60,8 +59,7 @@ abstract class ExternalUser {
                if ( is_null( $wgExternalAuthType ) ) {
                        return false;
                }
-               $class = "ExternalUser_$wgExternalAuthType";
-               $obj = new $class;
+               $obj = new $wgExternalAuthType;
                if ( !$obj->initFromId( $id ) ) {
                        return false;
                }
@@ -77,8 +75,7 @@ abstract class ExternalUser {
                if ( is_null( $wgExternalAuthType ) ) {
                        return false;
                }
-               $class = "ExternalUser_$wgExternalAuthType";
-               $obj = new $class;
+               $obj = new $wgExternalAuthType;
                if ( !$obj->initFromCookie( $cookie ) ) {
                        return false;
                }

diff --git a/includes/extauth/Hardcoded.php b/includes/extauth/Hardcoded.php
index 4d63f9d..7330aa1 100644 (file)
--- a/includes/extauth/Hardcoded.php
+++ b/includes/extauth/Hardcoded.php
@@ -21,7 +21,7 @@
  * This class supports external authentication from a literal array dumped in
  * LocalSettings.php.  It's mostly useful for testing.  Example configuration:
  *
- *   $wgExternalAuthType = 'Hardcoded';
+ *   $wgExternalAuthType = 'ExternalUser_Hardcoded';
  *   $wgExternalAuthConf = array(
  *       'Bob Smith' => array(
  *           'password' => 'literal string',

diff --git a/includes/extauth/MediaWiki.php b/includes/extauth/MediaWiki.php
index 14c8d93..4b4553b 100644 (file)
--- a/includes/extauth/MediaWiki.php
+++ b/includes/extauth/MediaWiki.php
@@ -21,7 +21,7 @@
  * This class supports authentication against an external MediaWiki database,
  * probably any version back to 1.5 or something.  Example configuration:
  *
- *   $wgExternalAuthType = 'MediaWiki';
+ *   $wgExternalAuthType = 'ExternalUser_MediaWiki';
  *   $wgExternalAuthConf = array(
  *       'DBtype' => 'mysql',
  *       'DBserver' => 'localhost',

diff --git a/includes/extauth/vB.php b/includes/extauth/vB.php
index 6f00874..81e5bb6 100644 (file)
--- a/includes/extauth/vB.php
+++ b/includes/extauth/vB.php
@@ -23,7 +23,7 @@
  * code, only reads from the database.  Example lines to put in
  * LocalSettings.php:
  *
- *   $wgExternalAuthType = 'vB';
+ *   $wgExternalAuthType = 'ExternalUser_vB';
  *   $wgExternalAuthConf = array(
  *       'server' => 'localhost',
  *       'username' => 'forum',