Ticket 37. The 'change_policy' field value added when tariff values insert into

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index e832c669950f4088d56b6fb0d3ae25ff7da26655..5d505307a72302bbddccbe92be280aefdea592a7 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 STORE * st,
            const TARIFFS * t,
            const ADMIN * a,

-           const USERS * u)
+           const USERS * u,
+           const SERVICES & svcs)

     : users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
     : users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),


@@ -93,6 +94,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       store(st),
       tariffs(t),
       tariff(NULL),
       store(st),
       tariffs(t),
       tariff(NULL),

+      m_services(svcs),

       settings(s),
       authorizedModificationTime(0),
       deleted(false),
       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 STORE * st,
                      const TARIFFS * t,
                      const ADMIN * a,

-                     const USERS * u)
+                     const USERS * u,
+                     const SERVICES & svcs)

     : users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
     : 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),
       store(st),
       tariffs(t),
       tariff(NULL),

+      m_services(svcs),

       settings(s),
       authorizedModificationTime(0),
       deleted(false),
       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),
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),

+      m_services(u.m_services),

       traffStat(u.traffStat),
       traffStatSaved(u.traffStatSaved),
       settings(u.settings),
       traffStat(u.traffStat),
       traffStatSaved(u.traffStatSaved),
       settings(u.settings),


@@ -552,6 +557,8 @@ if (authorizedBy.empty())
     lastDisconnectReason = reason;
     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter
     lastDisconnectReason = reason;
     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter

+    if (connected)
+        Disconnect(false, "not authorized");

     return;
     }
 }
     return;
     }
 }