Merge remote-tracking branch 'origin/ticket'

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 11f4385b505a853f2bb75a4f34dd62679b4a95a3..0e92975c2c0c064e97d1f8497cd78148aa27b086 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -80,7 +80,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
            const USERS * u,
            const SERVICES & svcs)
     : users(u),
            const USERS * u,
            const SERVICES & svcs)
     : users(u),

-      property(s->GetScriptsDir()),
+      property(*s),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),


@@ -150,7 +150,7 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
                      const USERS * u,
                      const SERVICES & svcs)
     : users(u),
                      const USERS * u,
                      const SERVICES & svcs)
     : users(u),

-      property(s->GetScriptsDir()),
+      property(*s),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),


@@ -237,7 +237,7 @@ pthread_mutex_init(&mutex, &attr);
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
     : USER(),
       users(u.users),
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
     : USER(),
       users(u.users),

-      property(u.settings->GetScriptsDir()),
+      property(*u.settings),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       login(u.login),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       login(u.login),


@@ -621,7 +621,7 @@ if (!fakeConnect)
     connected = true;
     }
 
     connected = true;
     }
 

-if (store->WriteUserConnect(login, currIP))
+if (!settings->GetDisableSessionLog() && store->WriteUserConnect(login, currIP))

     {
     WriteServLog("Cannot write connect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());
     {
     WriteServLog("Cannot write connect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());


@@ -685,8 +685,8 @@ std::string reasonMessage(reason);
 if (!lastDisconnectReason.empty())
     reasonMessage += ": " + lastDisconnectReason;
 
 if (!lastDisconnectReason.empty())
     reasonMessage += ": " + lastDisconnectReason;
 

-if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload,
-                               cash, freeMb, reasonMessage))
+if (!settings->GetDisableSessionLog() && store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload,
+                                                                    cash, freeMb, reasonMessage))

     {
     WriteServLog("Cannot write disconnect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());
     {
     WriteServLog("Cannot write disconnect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());


@@ -1178,10 +1178,24 @@ if (nextTariff.ConstData() != "")
     {
     const TARIFF * nt = tariffs->FindByName(nextTariff);
     if (nt == NULL)
     {
     const TARIFF * nt = tariffs->FindByName(nextTariff);
     if (nt == NULL)

+        {

         WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.",
                      login.c_str(), property.tariffName.Get().c_str());
         WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.",
                      login.c_str(), property.tariffName.Get().c_str());

+        }

     else
     else

-        property.tariffName.Set(nextTariff, sysAdmin, login, store);
+        {
+        std::string message = tariff->TariffChangeIsAllowed(*nt, stgTime);
+        if (message.empty())
+            {
+            property.tariffName.Set(nextTariff, sysAdmin, login, store);
+            }
+        else
+            {
+            WriteServLog("Tariff change is prohibited for user %s. %s",
+                         login.c_str(),
+                         message.c_str());
+            }
+        }

     ResetNextTariff();
     WriteConf();
     }
     ResetNextTariff();
     WriteConf();
     }


@@ -1563,13 +1577,18 @@ else if (!oldValue && newValue && user->IsInetable())
 //-----------------------------------------------------------------------------
 void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
 {
 //-----------------------------------------------------------------------------
 void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
 {

+STG_LOCKER lock(&user->mutex);

 if (user->settings->GetReconnectOnTariffChange() && user->connected)
     user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
 if (user->settings->GetReconnectOnTariffChange() &&
     !user->authorizedBy.empty() &&
     user->IsInetable())
 if (user->settings->GetReconnectOnTariffChange() && user->connected)
     user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
 if (user->settings->GetReconnectOnTariffChange() &&
     !user->authorizedBy.empty() &&
     user->IsInetable())

+    {
+    // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name.
+    user->property.Conf().tariffName = newTariff;

     user->Connect(false);
     user->Connect(false);

+    }

 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)