X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..446c23f6b9bd2d6f9a60e1ebbf979055c8e03507:/projects/stargazer/user_impl.h

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index ad5b4516..f1dd4175 100644
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -32,22 +32,23 @@
 #include <string>
 #include <set>
 
-#include "user.h"
-#include "os_int.h"
-#include "stg_const.h"
-#include "user_stat.h"
-#include "user_conf.h"
-#include "user_ips.h"
-#include "user_property.h"
-#include "auth.h"
-#include "stg_message.h"
-#include "noncopyable.h"
+#include "stg/user.h"
+#include "stg/os_int.h"
+#include "stg/const.h"
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/user_ips.h"
+#include "stg/user_property.h"
+#include "stg/auth.h"
+#include "stg/message.h"
+#include "stg/noncopyable.h"
 
 //-----------------------------------------------------------------------------
 class TARIFF;
 class TARIFFS;
 class ADMIN;
 class USER_IMPL;
+class SETTINGS_IMPL;
 //-----------------------------------------------------------------------------
 class USER_ID_GENERATOR {
 friend class USER_IMPL;
@@ -102,10 +103,10 @@ friend class CHG_TARIFF_NOTIFIER;
 friend class CHG_CASH_NOTIFIER;
 friend class CHG_IP_NOTIFIER;
 public:
-    USER_IMPL(const SETTINGS * settings,
+    USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
-              const ADMIN & sysAdmin,
+              const ADMIN * sysAdmin,
               const USERS * u);
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
@@ -116,7 +117,7 @@ public:
     int             WriteStat();
     int             WriteMonthStat();
 
-    std::string const & GetLogin() const { return login; }
+    const std::string & GetLogin() const { return login; }
     void            SetLogin(std::string const & l);
 
     uint32_t        GetCurrIP() const { return currIP; }
@@ -128,6 +129,12 @@ public:
     void            AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
     void            DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
 
+    void            AddConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+    void            DelConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+
+    void            AddConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+    void            DelConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+
     int             GetID() const { return id; }
 
     double          GetPassiveTimePart() const;
@@ -182,7 +189,7 @@ public:
     void            ProcessNewMonth();
 
     bool            IsInetable();
-    std::string          GetEnabledDirs();
+    std::string     GetEnabledDirs();
 
     void            OnAdd();
     void            OnDelete();
@@ -210,18 +217,14 @@ private:
 
     USER_ID_GENERATOR userIDGenerator;
 
-    uint32_t        __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
+    uint32_t        __currIP; // Current user's ip
     USER_PROPERTY<uint32_t> currIP;
 
-    /*
-    ë ÔÏÍÕ ÍÏÍÅÎÔÕ ËÁË ÍÙ ÕÖÅ ÎÅ Á×ÔÏÒÉÚÏ×ÁÎÉÙ, ÎÏ ÅÝÅ ÎÅ ×ÙÐÏÌÎÅÎ Disconnect,
-    currIP ÕÖÅ ÓÂÒÏÛÅÎ. ðÏÓÌÅÄÎÅÅ ÚÎÁÞÅÎÉÅ currIP ÓÏÈÒÁÎÑÅÍ × lastIPForDisconnect
-    */
-    uint32_t        lastIPForDisconnect;
+    uint32_t        lastIPForDisconnect; // User's ip after unauth but before disconnect
 
     time_t          pingTime;
 
-    const ADMIN &   sysAdmin;
+    const ADMIN *   sysAdmin;
     const STORE *   store;
 
     const TARIFFS * tariffs;
@@ -230,7 +233,7 @@ private:
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
-    const SETTINGS * settings;
+    const SETTINGS_IMPL * settings;
 
     std::set<const AUTH *> authorizedBy;
 
@@ -238,8 +241,8 @@ private:
 
     bool            deleted;
 
-    time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
-    time_t          lastWriteDeatiledStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
+    time_t          lastWriteStat;
+    time_t          lastWriteDetailedStat;
 
     // Properties
     USER_PROPERTY<double>         & cash;
@@ -293,4 +296,6 @@ private:
 };
 //-----------------------------------------------------------------------------
 
+typedef USER_IMPL * USER_IMPL_PTR;
+
 #endif //USER_H