Ticket 37. if (ts == "0000-00-00 00:00:00") construction added in the

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 29cc63c4f57b12522e8df7189ba2d623366f02f4..77887514b272b2603d5a3422b028562479736a73 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -125,13 +125,15 @@ public:
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
               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,
 #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();
 #endif
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();


@@ -200,7 +202,6 @@ public:
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 

-    void            PrintUser() const;

     void            Run();
 
     const std::string & GetStrError() const { return errorStr; }
     void            Run();
 
     const std::string & GetStrError() const { return errorStr; }


@@ -230,6 +231,8 @@ public:
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 

+    void            Init();
+

     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;
     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;


@@ -268,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 

+    const SERVICES & m_services;
+

     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;