Fix tariff field name in XML-RPC API documentation (tariff -> name)

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 9dff1a346fd7980c1819d76d87b1ee840375a0db..be28cc96d2aabdf41d33d33619e5fbd3cb126580 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -32,16 +32,16 @@
 #include <string>
 #include <set>
 
 #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 TARIFF;


@@ -129,6 +129,12 @@ public:
     void            AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
     void            DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
 
     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;
     int             GetID() const { return id; }
 
     double          GetPassiveTimePart() const;


@@ -211,14 +217,10 @@ private:
 
     USER_ID_GENERATOR userIDGenerator;
 
 
     USER_ID_GENERATOR userIDGenerator;
 

-    uint32_t        __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
+    uint32_t        __currIP; // Current user's ip

     USER_PROPERTY<uint32_t> currIP;
 
     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;
 
 
     time_t          pingTime;
 


@@ -239,8 +241,8 @@ private:
 
     bool            deleted;
 
 
     bool            deleted;
 

-    time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
-    time_t          lastWriteDetailedStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
+    time_t          lastWriteStat;
+    time_t          lastWriteDetailedStat;

 
     // Properties
     USER_PROPERTY<double>         & cash;
 
     // Properties
     USER_PROPERTY<double>         & cash;