X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/793728a58d8f97daf7de1dde7a02a5c4a30e30d4..9c340da9ffa670c20c3658a2be43d35868a9f5d9:/projects/stargazer/user_impl.h?ds=sidebyside

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 68945d2c..8bc69664 100644
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -66,7 +66,7 @@ private:
 class CHG_PASSIVE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:
-    CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const int & oldPassive, const int & newPassive);
 
 private:
@@ -76,7 +76,7 @@ private:
 class CHG_DISABLED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:
-    CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const int & oldValue, const int & newValue);
 
 private:
@@ -86,7 +86,7 @@ private:
 class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string>,
                             private NONCOPYABLE {
 public:
-    CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:
@@ -96,7 +96,7 @@ private:
 class CHG_CASH_NOTIFIER : public PROPERTY_NOTIFIER_BASE<double>,
                           private NONCOPYABLE {
 public:
-    CHG_CASH_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_CASH_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const double & oldCash, const double & newCash);
 
 private:
@@ -106,7 +106,7 @@ private:
 class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:
-    CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
 private:
@@ -125,13 +125,15 @@ public:
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);
 #else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);
 #endif
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
@@ -181,6 +183,8 @@ public:
 
     const DIR_TRAFF & GetSessionUpload() const { return sessionUpload; }
     const DIR_TRAFF & GetSessionDownload() const { return sessionDownload; }
+    time_t GetSessionUploadModificationTime() const { return sessionUploadModTime; }
+    time_t GetSessionDownloadModificationTime() const { return sessionDownloadModTime; }
 
     bool            GetConnected() const { return connected; }
     time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }
@@ -198,7 +202,6 @@ public:
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 
-    void            PrintUser() const;
     void            Run();
 
     const std::string & GetStrError() const { return errorStr; }
@@ -215,9 +218,10 @@ public:
     void            ProcessDayFee();
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();
+    void            ProcessDailyFee();
 
     bool            IsInetable();
-    std::string     GetEnabledDirs();
+    std::string     GetEnabledDirs() const;
 
     void            OnAdd();
     void            OnDelete();
@@ -227,6 +231,8 @@ public:
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
+    void            Init();
+
     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;
@@ -246,7 +252,6 @@ private:
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;
-    std::string     lastDisconnectReason;
 
     bool            enabledDirs[DIR_NUM];
 
@@ -266,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
+    const SERVICES & m_services;
+
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
@@ -325,6 +332,8 @@ private:
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;
+    time_t                   sessionUploadModTime;
+    time_t                   sessionDownloadModTime;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_DISABLED_NOTIFIER    disabledNotifier;