Some fixes in USER_IMPL.

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index e832c669950f4088d56b6fb0d3ae25ff7da26655..3693057692592f549084729b6769b588018f8211 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -77,7 +77,8 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
            const STORE * st,
            const TARIFFS * t,
            const ADMIN * a,
-           const USERS * u)
+           const USERS * u,
+           const SERVICES & svcs)
     : users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
@@ -93,6 +94,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       store(st),
       tariffs(t),
       tariff(NULL),
+      m_services(svcs),
       settings(s),
       authorizedModificationTime(0),
       deleted(false),
@@ -145,7 +147,8 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
                      const STORE * st,
                      const TARIFFS * t,
                      const ADMIN * a,
-                     const USERS * u)
+                     const USERS * u,
+                     const SERVICES & svcs)
     : users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
@@ -161,6 +164,7 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       store(st),
       tariffs(t),
       tariff(NULL),
+      m_services(svcs),
       settings(s),
       authorizedModificationTime(0),
       deleted(false),
@@ -249,6 +253,7 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),
+      m_services(u.m_services),
       traffStat(u.traffStat),
       traffStatSaved(u.traffStatSaved),
       settings(u.settings),

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 30b6aa78858d4128422bb718b12343b36de31520..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 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();
@@ -269,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
+    const SERVICES & m_services;
+
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;