X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2db10cd7443b651fc3d116fd007db85347de7acb..f19e92103c3b337e80c8e3b598b468d6ab14c154:/projects/stargazer/user_impl.h

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 68b77268..5e8f49db 100644
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -48,7 +48,11 @@ class TARIFF;
 class TARIFFS;
 class ADMIN;
 class USER_IMPL;
+#ifdef USE_ABSTRACT_SETTINGS
+class SETTINGS;
+#else
 class SETTINGS_IMPL;
+#endif
 //-----------------------------------------------------------------------------
 class USER_ID_GENERATOR {
 friend class USER_IMPL;
@@ -63,6 +67,16 @@ public:
     CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const int & oldPassive, const int & newPassive);
 
+private:
+    USER_IMPL * user;
+};
+//-----------------------------------------------------------------------------
+class CHG_DISABLED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
+                             private NONCOPYABLE {
+public:
+    CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}
+    void Notify(const int & oldValue, const int & newValue);
+
 private:
     USER_IMPL * user;
 };
@@ -87,11 +101,11 @@ private:
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
-class CHG_IP_NOTIFIER : public PROPERTY_NOTIFIER_BASE<uint32_t>,
-                        private NONCOPYABLE {
+class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
+                         private NONCOPYABLE {
 public:
-    CHG_IP_NOTIFIER(USER_IMPL * u) : user(u) {}
-    void Notify(const uint32_t & oldCash, const uint32_t & newCash);
+    CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
+    void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
 private:
     USER_IMPL * user;
@@ -99,15 +113,24 @@ private:
 //-----------------------------------------------------------------------------
 class USER_IMPL : public USER {
 friend class CHG_PASSIVE_NOTIFIER;
+friend class CHG_DISABLED_NOTIFIER;
 friend class CHG_TARIFF_NOTIFIER;
 friend class CHG_CASH_NOTIFIER;
-friend class CHG_IP_NOTIFIER;
+friend class CHG_IPS_NOTIFIER;
 public:
+#ifdef USE_ABSTRACT_SETTINGS
+    USER_IMPL(const SETTINGS * settings,
+              const STORE * store,
+              const TARIFFS * tariffs,
+              const ADMIN * sysAdmin,
+              const USERS * u);
+#else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
               const USERS * u);
+#endif
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
 
@@ -117,23 +140,23 @@ 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; }
     time_t          GetCurrIPModificationTime() const { return currIP.ModificationTime(); }
 
-    void            AddCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
-    void            DelCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+    void            AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier);
+    void            DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier);
 
-    void            AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
-    void            DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+    void            AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier);
+    void            DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier);
 
-    void            AddConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
-    void            DelConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+    void            AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier);
+    void            DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier);
 
-    void            AddConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
-    void            DelConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+    void            AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier);
+    void            DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier);
 
     int             GetID() const { return id; }
 
@@ -159,7 +182,7 @@ public:
 
     bool            GetConnected() const { return connected; }
     time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }
-    int             GetAuthorized() const { return authorizedBy.size(); }
+    int             GetAuthorized() const { return static_cast<int>(authorizedBy.size()); }
     int             Authorize(uint32_t ip, uint32_t enabledDirs, const AUTH * auth);
     void            Unauthorize(const AUTH * auth);
     bool            IsAuthorizedBy(const AUTH * auth) const;
@@ -174,8 +197,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
 
-    USER_PROPERTIES & GetProperty() { return property; };
-    const USER_PROPERTIES & GetProperty() const { return property; };
+    USER_PROPERTIES & GetProperty() { return property; }
+    const USER_PROPERTIES & GetProperty() const { return property; }
 
     void            SetDeleted() { deleted = true; }
     bool            GetDeleted() const { return deleted; }
@@ -184,17 +207,18 @@ public:
 
     void            MidnightResetSessionStat();
     void            ProcessDayFee();
-    void            SetPrepaidTraff();
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();
 
     bool            IsInetable();
-    std::string          GetEnabledDirs();
+    std::string     GetEnabledDirs();
 
     void            OnAdd();
     void            OnDelete();
 
 private:
+    USER_IMPL & operator=(const USER_IMPL & rvalue);
+
     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;
@@ -203,6 +227,8 @@ private:
     void            Disconnect(bool fakeDisconnect, const std::string & reason);
     int             SaveMonthStat(int month, int year);
 
+    void            SetPrepaidTraff();
+
     int             SendMessage(STG_MSG & msg) const;
     void            ScanMessage();
 
@@ -233,7 +259,11 @@ private:
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
+#ifdef USE_ABSTRACT_SETTINGS
+    const SETTINGS * settings;
+#else
     const SETTINGS_IMPL * settings;
+#endif
 
     std::set<const AUTH *> authorizedBy;
 
@@ -286,9 +316,10 @@ private:
     DIR_TRAFF                sessionDownload;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
+    CHG_DISABLED_NOTIFIER    disabledNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;
-    CHG_IP_NOTIFIER          ipNotifier;
+    CHG_IPS_NOTIFIER         ipNotifier;
 
     mutable pthread_mutex_t  mutex;