From 871f463262f40040ceb4a6c56eb44589a1cda15d Mon Sep 17 00:00:00 2001
From: Christoph Burschka
Date: Thu, 16 Jan 2014 19:30:08 +0100
Subject: Finally remove unused setpass/register hooks.

---
 core/EjabberdAuth.php             |  9 +--------
 plugins/drupal7/BridgeDrupal7.php | 12 ------------
 plugins/drupal8/BridgeDrupal8.php | 12 ------------
 plugins/phpbb30/BridgePhpBB30.php | 14 --------------
 plugins/phpbb31/BridgePhpBB31.php | 14 --------------
 plugins/smf2/BridgeSMF2.php       | 12 ------------
 6 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/core/EjabberdAuth.php b/core/EjabberdAuth.php
index f3a5bfc..9160ec5 100644
--- a/core/EjabberdAuth.php
+++ b/core/EjabberdAuth.php
@@ -74,17 +74,10 @@ class EjabberdAuth {
         list($username, $server, $password) = $args;
         return $this->bridge->auth($username, $server, $password);
       case 'setpass':
-        list($username, $server, $password) = $args;
-        return $this->bridge->setpass($username, $server, $password);
       case 'tryregister':
-        list($username, $server, $password) = $args;
-        return $this->bridge->tryregister($username, $server, $password);
       case 'removeuser':
-        list($username, $server) = $args;
-        return $this->bridge->removeuser($username, $server);
       case 'removeuser3':
-        list($username, $server, $password) = $args;
-        return $this->bridge->auth($username, $server, $password) && $this->bridge->removeuser($username, $password);
+        return FALSE;
       default:
         $this->stop();
     }
diff --git a/plugins/drupal7/BridgeDrupal7.php b/plugins/drupal7/BridgeDrupal7.php
index 3f7ef67..85f21a6 100644
--- a/plugins/drupal7/BridgeDrupal7.php
+++ b/plugins/drupal7/BridgeDrupal7.php
@@ -8,16 +8,4 @@ class BridgeDrupal7 extends EjabberdAuthBridge {
   function auth($username, $server, $password) {
     return user_authenticate($username, $password) !== FALSE;
   }
-
-  function setpass($username, $server, $password) {
-    return FALSE;
-  }
-
-  function tryregister($username, $server, $password) {
-    return FALSE;
-  }
-
-  function removeuser($username, $server) {
-    return FALSE;
-  }
 }
diff --git a/plugins/drupal8/BridgeDrupal8.php b/plugins/drupal8/BridgeDrupal8.php
index 0be6879..eadbdaa 100644
--- a/plugins/drupal8/BridgeDrupal8.php
+++ b/plugins/drupal8/BridgeDrupal8.php
@@ -8,16 +8,4 @@ class BridgeDrupal8 extends EjabberdAuthBridge {
   function auth($username, $server, $password) {
     return user_authenticate($username, $password) !== FALSE;
   }
-
-  function setpass($username, $server, $password) {
-    return FALSE;
-  }
-
-  function tryregister($username, $server, $password) {
-    return FALSE;
-  }
-
-  function removeuser($username, $server) {
-    return FALSE;
-  }
 }
diff --git a/plugins/phpbb30/BridgePhpBB30.php b/plugins/phpbb30/BridgePhpBB30.php
index fd48e31..45ea642 100644
--- a/plugins/phpbb30/BridgePhpBB30.php
+++ b/plugins/phpbb30/BridgePhpBB30.php
@@ -19,18 +19,4 @@ class BridgePhpBB30 extends EjabberdAuthBridge {
     $result = $this->auth->login($username, $password);
     return $result['status'] == LOGIN_SUCCESS;
   }
-  
-  // The following functions are disabled. This script will not change the phpBB user database.
-  
-  function setpass($username, $server, $password) {
-    return FALSE;
-  }
-
-  function tryregister($username, $server, $password) {
-    return FALSE;
-  }
-
-  function removeuser($username, $server) {
-    return FALSE;
-  }
 }
diff --git a/plugins/phpbb31/BridgePhpBB31.php b/plugins/phpbb31/BridgePhpBB31.php
index b6028f5..3cfb89c 100644
--- a/plugins/phpbb31/BridgePhpBB31.php
+++ b/plugins/phpbb31/BridgePhpBB31.php
@@ -19,18 +19,4 @@ class BridgePhpBB31 extends EjabberdAuthBridge {
     $result = $this->auth->login($username, $password);
     return $result['status'] == LOGIN_SUCCESS;
   }
-  
-  // The following functions are disabled. This script will not change the phpBB user database.
-  
-  function setpass($username, $server, $password) {
-    return FALSE;
-  }
-
-  function tryregister($username, $server, $password) {
-    return FALSE;
-  }
-
-  function removeuser($username, $server) {
-    return FALSE;
-  }
 }
diff --git a/plugins/smf2/BridgeSMF2.php b/plugins/smf2/BridgeSMF2.php
index 30aa436..a8b474e 100644
--- a/plugins/smf2/BridgeSMF2.php
+++ b/plugins/smf2/BridgeSMF2.php
@@ -16,16 +16,4 @@ class BridgeSMF2 extends EjabberdAuthBridge {
   function auth($username, $server, $password) {
     return smf_ssi('checkPassword', $username, $password, TRUE);
   }
-
-  function setpass($username, $server, $password) {
-    return FALSE;
-  }
-
-  function tryregister($username, $server, $password) {
-    return FALSE;
-  }
-
-  function removeuser($username, $server) {
-    return FALSE;
-  }
 }
-- 
cgit v1.1