Refactoring of plugin names complete.

4 files changed, 12 insertions, 13 deletions

diff --git a/plugins/phpbb30/BridgePhpBB30.php b/plugins/phpbb30/BridgePhpBB30.php
index bc7d8c8..fd48e31 100644
--- a/plugins/phpbb30/BridgePhpBB30.php
+++ b/plugins/phpbb30/BridgePhpBB30.php
@@ -1,6 +1,6 @@
 <?php
 
-class BridgePhpBB3 extends EjabberdAuthBridge {
+class BridgePhpBB30 extends EjabberdAuthBridge {
   var $auth;
   var $db;
   
diff --git a/plugins/phpbb30/phpbb30.module b/plugins/phpbb30/phpbb30.module
index 7502094..2fa8b9a 100644
--- a/plugins/phpbb30/phpbb30.module
+++ b/plugins/phpbb30/phpbb30.module
@@ -1,11 +1,11 @@
 <?php
 
-function phpbb3_init($config) {
+function phpbb30_init($config) {
   global $phpbb_root_path;
   $phpbb_root_path = $config['root_path'];
   // Bootstrap the phpBB system.
-  require_once __DIR__ . '/phpbb3_bootstrap.php';
+  require_once __DIR__ . '/phpbb30_bootstrap.php';
   // Load the plugin.
-  require_once __DIR__ . '/BridgePhpBB3.php';
-  return new BridgePhpBB3($auth, $db);
+  require_once __DIR__ . '/BridgePhpBB30.php';
+  return new BridgePhpBB30($auth, $db);
 }
diff --git a/plugins/phpbb31/BridgePhpBB31.php b/plugins/phpbb31/BridgePhpBB31.php
index e60cbae..b6028f5 100644
--- a/plugins/phpbb31/BridgePhpBB31.php
+++ b/plugins/phpbb31/BridgePhpBB31.php
@@ -1,12 +1,10 @@
 <?php
 
-class JabberAuthPhpBB extends JabberAuth {
+class BridgePhpBB31 extends EjabberdAuthBridge {
   var $auth;
   var $db;
   
-  function __construct($auth, $db, $logpath) {
-    $this->logpath = $logpath;
-    parent::init();
+  function __construct($auth, $db) {
     $this->auth = $auth;
     $this->db = $db;
   }
diff --git a/plugins/phpbb31/phpbb31.module b/plugins/phpbb31/phpbb31.module
index 22b4de6..03aa2a2 100644
--- a/plugins/phpbb31/phpbb31.module
+++ b/plugins/phpbb31/phpbb31.module
@@ -1,10 +1,11 @@
 <?php
 
-function phpbb4_init($config) {
+function phpbb31_init($config) {
+  global $phpbb_root_path;
   $phpbb_root_path = $config['root_path'];
   // Bootstrap the phpBB system.
-  require_once __DIR__ . '/phpbb4_bootstrap.php';
+  require_once __DIR__ . '/phpbb31_bootstrap.php';
   // Load the plugin.
-  require_once __DIR__ . '/JabberAuthPhpBB4.php';
-  return new JabberAuthPhpBB4($config['auth'], $config['db']);
+  require_once __DIR__ . '/BridgePhpBB31.php';
+  return new BridgePhpBB31($auth, $db);
 }