X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b50165cd491723d34aea2d05a41e78a29edd14a9..45dadc36ce7759011b174a4597c55e899c9dfc04:/projects/stargazer/user_impl.h?ds=sidebyside

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index e9c9f986..2fc2729e 100644
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -32,23 +32,27 @@
 #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;
+#ifdef USE_ABSTRACT_SETTINGS
+class SETTINGS;
+#else
 class SETTINGS_IMPL;
+#endif
 //-----------------------------------------------------------------------------
 class USER_ID_GENERATOR {
 friend class USER_IMPL;
@@ -64,6 +68,9 @@ public:
     void Notify(const int & oldPassive, const int & newPassive);
 
 private:
+    CHG_PASSIVE_NOTIFIER(const CHG_PASSIVE_NOTIFIER & rvalue);
+    CHG_PASSIVE_NOTIFIER & operator=(const CHG_PASSIVE_NOTIFIER & rvalue);
+
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
@@ -74,6 +81,9 @@ public:
     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:
+    CHG_TARIFF_NOTIFIER(const CHG_TARIFF_NOTIFIER & rvalue);
+    CHG_TARIFF_NOTIFIER & operator=(const CHG_TARIFF_NOTIFIER & rvalue);
+
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
@@ -84,14 +94,20 @@ public:
     void Notify(const double & oldCash, const double & newCash);
 
 private:
+    CHG_CASH_NOTIFIER(const CHG_CASH_NOTIFIER & rvalue);
+    CHG_CASH_NOTIFIER & operator=(const CHG_CASH_NOTIFIER & rvalue);
+
     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(const CHG_IPS_NOTIFIER & rvalue);
+    CHG_IPS_NOTIFIER & operator=(const CHG_IPS_NOTIFIER & rvalue);
+
+    CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
+    void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
 private:
     USER_IMPL * user;
@@ -101,13 +117,21 @@ class USER_IMPL : public USER {
 friend class CHG_PASSIVE_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,7 +141,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; }
@@ -184,17 +208,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 +228,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 +260,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;
 
@@ -288,7 +319,7 @@ private:
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;
-    CHG_IP_NOTIFIER          ipNotifier;
+    CHG_IPS_NOTIFIER         ipNotifier;
 
     mutable pthread_mutex_t  mutex;
 
@@ -296,4 +327,6 @@ private:
 };
 //-----------------------------------------------------------------------------
 
+typedef USER_IMPL * USER_IMPL_PTR;
+
 #endif //USER_H