X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/477aa660aac26aeb8dfede1e439f023dbaba41c9..1b2e8014ab6bc93d0ab0fe320ad3cfc8ed94ab81:/projects/stargazer/user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 51f49ff1..36c0f84f 100644
--- 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),
-      property(s->GetScriptsDir()),
+      property(*s),
       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),
-      property(s->GetScriptsDir()),
+      property(*s),
       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),
-      property(u.settings->GetScriptsDir()),
+      property(*u.settings),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       login(u.login),
@@ -557,6 +557,8 @@ if (authorizedBy.empty())
     lastDisconnectReason = reason;
     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter
+    if (connected)
+        Disconnect(false, "not authorized");
     return;
     }
 }
@@ -619,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());
@@ -683,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());
@@ -1176,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, 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();
     }
@@ -1326,75 +1342,6 @@ switch (settings->GetFeeChargeType())
 ResetPassiveTime();
 }
 //-----------------------------------------------------------------------------
-void USER_IMPL::ProcessServices()
-{
-struct tm tms;
-time_t t = stgTime;
-localtime_r(&t, &tms);
-
-double passiveTimePart = 1.0;
-if (!settings->GetFullFee())
-    {
-    passiveTimePart = GetPassiveTimePart();
-    }
-else
-    {
-    if (passive.ConstData())
-        {
-        printfd(__FILE__, "Don't charge fee `cause we are passive\n");
-        return;
-        }
-    }
-
-for (size_t i = 0; i < property.Conf().services.size(); ++i)
-    {
-    SERVICE_CONF conf;
-    if (m_services.Find(property.Conf().services[i], &conf))
-        continue;
-    if (conf.payDay == tms.tm_mday ||
-        conf.payDay == 0 && tms.tm_mday == DaysInCurrentMonth())
-        {
-        double c = cash;
-        double fee = conf.cost * passiveTimePart;
-        printfd(__FILE__, "Service fee. login: %8s Cash=%f Credit=%f  Fee=%f PassiveTimePart=%f fee=%f\n",
-                login.c_str(),
-                cash.ConstData(),
-                credit.ConstData(),
-                tariff->GetFee(),
-                passiveTimePart,
-                fee);
-        switch (settings->GetFeeChargeType())
-            {
-            case 0:
-                property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                SetPrepaidTraff();
-                break;
-            case 1:
-                if (c + credit >= 0)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            case 2:
-                if (c + credit >= fee)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            case 3:
-                if (c >= 0)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            }
-        }
-    }
-}
-//-----------------------------------------------------------------------------
 void USER_IMPL::SetPrepaidTraff()
 {
 if (tariff != NULL)
@@ -1561,13 +1508,18 @@ else if (!oldValue && newValue && user->IsInetable())
 //-----------------------------------------------------------------------------
 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)