Correcting data conversion in GetParamValue

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 2fc2729e2aefc566e1a7cb443b3f2d9e0c7c4ed4..d240f0c8c161ae85a42ddcd2d3fee522fe803181 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -68,9 +68,16 @@ 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;
+};
+//-----------------------------------------------------------------------------
+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;
 };
 //-----------------------------------------------------------------------------
@@ -81,9 +88,6 @@ 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;
 };
 //-----------------------------------------------------------------------------
@@ -94,18 +98,12 @@ 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_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:
-    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);
 
@@ -115,6 +113,7 @@ 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_IPS_NOTIFIER;
@@ -147,17 +146,17 @@ public:
     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; }
 
@@ -183,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;
@@ -198,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; }
@@ -217,6 +216,8 @@ public:
     void            OnAdd();
     void            OnDelete();
 
+    virtual std::string GetParamValue(const std::string & name) const;
+
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
@@ -317,6 +318,7 @@ private:
     DIR_TRAFF                sessionDownload;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
+    CHG_DISABLED_NOTIFIER    disabledNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;
     CHG_IPS_NOTIFIER         ipNotifier;