From: Elena Mamontova <helenh463@gmail.com>
Date: Mon, 22 Aug 2016 12:40:53 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket37
X-Git-Tag: 2.409~111
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/5c0444f61fac031c47cac726e0b0bb9188f6eb18?hp=-c

Merge remote-tracking branch 'origin/stg-2.409' into ticket37
---

5c0444f61fac031c47cac726e0b0bb9188f6eb18
diff --combined projects/stargazer/user_impl.cpp
index f8335525,d7bc8ea2..92528a6f
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@@ -1178,24 -1178,10 +1178,24 @@@ if (nextTariff.ConstData() != ""
      {
      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());
 +        }
      else
 -        property.tariffName.Set(nextTariff, sysAdmin, login, store);
 +        {
 +        std::string message = tariff->TariffChangeIsAllowed(*nt);
 +        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();
      }
@@@ -1508,13 -1494,18 +1508,18 @@@ else if (!oldValue && newValue && user-
  //-----------------------------------------------------------------------------
  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())
+     {
+     // 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);
+     }
  }
  //-----------------------------------------------------------------------------
  void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)