From caeb73a2cdf6db24490bbe3657372fb1ba52b78e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Wed, 15 Jul 2009 23:11:54 +0200
Subject: =?UTF-8?q?UserManager=20=C3=BCberarbeitet=20UserConfigBackend=20e?=
 =?UTF-8?q?ingef=C3=BChrt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/UserBackendMysql/Module.h             |  2 +-
 src/modules/UserBackendMysql/UserBackendMysql.cpp |  1 +
 src/modules/UserBackendMysql/UserBackendMysql.h   | 12 +++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/UserBackendMysql/Module.h b/src/modules/UserBackendMysql/Module.h
index 7cd963a..93396a7 100644
--- a/src/modules/UserBackendMysql/Module.h
+++ b/src/modules/UserBackendMysql/Module.h
@@ -22,8 +22,8 @@
 
 #include "UserBackendMysql.h"
 
-#include <Common/UserManager.h>
 #include <Common/Module.h>
+#include <Common/UserManager.h>
 
 namespace Mad {
 namespace Modules {
diff --git a/src/modules/UserBackendMysql/UserBackendMysql.cpp b/src/modules/UserBackendMysql/UserBackendMysql.cpp
index e076b10..e7c656b 100644
--- a/src/modules/UserBackendMysql/UserBackendMysql.cpp
+++ b/src/modules/UserBackendMysql/UserBackendMysql.cpp
@@ -36,6 +36,7 @@ namespace Mad {
 namespace Modules {
 namespace UserBackendMysql {
 
+const std::string UserBackendMysql::name("UserBackendMysql");
 
 bool UserBackendMysql::handleConfigEntry(const Core::ConfigEntry &entry, bool handled) {
   if(handled)
diff --git a/src/modules/UserBackendMysql/UserBackendMysql.h b/src/modules/UserBackendMysql/UserBackendMysql.h
index 5ed8480..85bc678 100644
--- a/src/modules/UserBackendMysql/UserBackendMysql.h
+++ b/src/modules/UserBackendMysql/UserBackendMysql.h
@@ -20,7 +20,7 @@
 #ifndef MAD_MODULES_USERBACKENDMYSQL_USERBACKENDMYSQL_H_
 #define MAD_MODULES_USERBACKENDMYSQL_USERBACKENDMYSQL_H_
 
-#include <Common/UserBackend.h>
+#include <Common/UserDBBackend.h>
 #include <Common/Application.h>
 
 #include <Core/Configurable.h>
@@ -35,7 +35,7 @@ namespace Mad {
 namespace Modules {
 namespace UserBackendMysql {
 
-class UserBackendMysql : public Common::UserBackend, private Core::Configurable, private boost::noncopyable {
+class UserBackendMysql : public Common::UserDBBackend, private Core::Configurable, private boost::noncopyable {
   private:
     typedef std::map<std::string, boost::variant<std::string, unsigned long> > ArgumentMap;
 
@@ -84,6 +84,8 @@ class UserBackendMysql : public Common::UserBackend, private Core::Configurable,
         }
     };
 
+    static const std::string name;
+
     Common::Application *application;
 
     std::string host, username, passwd, db, unixSocket;
@@ -104,7 +106,7 @@ class UserBackendMysql : public Common::UserBackend, private Core::Configurable,
     boost::mutex mutex;
 
   protected:
-    virtual bool handleConfigEntry(const Core::ConfigEntry &entry, bool);
+    virtual bool handleConfigEntry(const Core::ConfigEntry &entry, bool handled);
     virtual void configFinished();
 
     virtual boost::shared_ptr<const std::map<unsigned long, Common::UserInfo> > getUserList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
@@ -139,6 +141,10 @@ class UserBackendMysql : public Common::UserBackend, private Core::Configurable,
         mysql = 0;
       }
     }
+
+    virtual const std::string& getName() {
+      return name;
+    }
 };
 
 }
-- 
cgit v1.2.3