const USERS * u,
const SERVICES & svcs)
: users(u),
- property(s->GetScriptsDir()),
+ property(*s),
WriteServLog(GetStgLogger()),
lastScanMessages(0),
id(0),
const USERS * u,
const SERVICES & svcs)
: users(u),
- property(s->GetScriptsDir()),
+ property(*s),
WriteServLog(GetStgLogger()),
lastScanMessages(0),
id(0),
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),
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());
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());
{
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();
}