Merge branch 'stg-2.409-radius'

[stg.git] / projects / stargazer / admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index 2ec9912913fcb8235cc9a73c4f1f146d8a4a6330..03aa4ece97ed9a14463e9c511d66ed928635d6ea 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -31,46 +31,52 @@
 #ifndef ADMINS_IMPL_H
 #define ADMINS_IMPL_H
 
-#include <pthread.h>
-
-#include <list>
-#include <map>
-#include <string>
+#include "admin_impl.h"
 
 #include "stg/admins.h"
 #include "stg/admin.h"
 #include "stg/locker.h"
 #include "stg/store.h"
 #include "stg/noncopyable.h"
-#include "admin_impl.h"
+#include "stg/logger.h"
+
+#include <list>
+#include <map>
+#include <string>
+
+#include <pthread.h>
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
-    ADMINS_IMPL(STORE * st);
+    explicit ADMINS_IMPL(STORE * st);
     virtual ~ADMINS_IMPL() {}
 
     int           Add(const std::string & login, const ADMIN * admin);
     int           Del(const std::string & login, const ADMIN * admin);
     int           Change(const ADMIN_CONF & ac, const ADMIN * admin);
-    void          PrintAdmins() const;
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }
-    bool          FindAdmin(const std::string & l, ADMIN ** admin);
-    bool          AdminExists(const std::string & login) const;
-    bool          AdminCorrect(const std::string & login,
-                               const std::string & password,
-                               ADMIN ** admin);
+    bool          Find(const std::string & l, ADMIN ** admin);
+    bool          Exists(const std::string & login) const;
+    bool          Correct(const std::string & login,
+                          const std::string & password,
+                          ADMIN ** admin);
     const std::string & GetStrError() const { return strError; }
 
+    size_t        Count() const { return data.size(); }
+
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
     int CloseSearch(int) const;
 
 private:
-    typedef list<ADMIN_IMPL>::iterator admin_iter;
-    typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
+    ADMINS_IMPL(const ADMINS_IMPL & rvalue);
+    ADMINS_IMPL & operator=(const ADMINS_IMPL & rvalue);
+
+    typedef std::list<ADMIN_IMPL>::iterator admin_iter;
+    typedef std::list<ADMIN_IMPL>::const_iterator const_admin_iter;
 
-    int             ReadAdmins();
+    int             Read();
 
     ADMIN_IMPL              stg;
     ADMIN_IMPL              noAdmin;