From: Elena Mamontova <helenh463@gmail.com>
Date: Tue, 6 Sep 2016 13:11:04 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket37
X-Git-Tag: 2.409~101
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7dc3852ce6e3c2344e2de0815c1c79fc6b849bcf?hp=-c

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

7dc3852ce6e3c2344e2de0815c1c79fc6b849bcf
diff --combined projects/stargazer/user_impl.cpp
index 92528a6f,55a0b197..aea25c78
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@@ -80,7 -80,7 +80,7 @@@ USER_IMPL::USER_IMPL(const SETTINGS * s
             const USERS * u,
             const SERVICES & svcs)
      : users(u),
-       property(s->GetScriptsDir()),
+       property(*s),
        WriteServLog(GetStgLogger()),
        lastScanMessages(0),
        id(0),
@@@ -150,7 -150,7 +150,7 @@@ USER_IMPL::USER_IMPL(const SETTINGS_IMP
                       const USERS * u,
                       const SERVICES & svcs)
      : users(u),
-       property(s->GetScriptsDir()),
+       property(*s),
        WriteServLog(GetStgLogger()),
        lastScanMessages(0),
        id(0),
@@@ -237,7 -237,7 +237,7 @@@ pthread_mutex_init(&mutex, &attr)
  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),
@@@ -621,7 -621,7 +621,7 @@@ if (!fakeConnect
      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());
@@@ -685,8 -685,8 +685,8 @@@ std::string reasonMessage(reason)
  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());
@@@ -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();
      }