const STORE * st,
const TARIFFS * t,
const ADMIN * a,
- const USERS * u)
+ const USERS * u,
+ const SERVICES & svcs)
: users(u),
property(s->GetScriptsDir()),
WriteServLog(GetStgLogger()),
store(st),
tariffs(t),
tariff(NULL),
+ m_services(svcs),
settings(s),
authorizedModificationTime(0),
deleted(false),
const STORE * st,
const TARIFFS * t,
const ADMIN * a,
- const USERS * u)
+ const USERS * u,
+ const SERVICES & svcs)
: users(u),
property(s->GetScriptsDir()),
WriteServLog(GetStgLogger()),
store(st),
tariffs(t),
tariff(NULL),
+ m_services(svcs),
settings(s),
authorizedModificationTime(0),
deleted(false),
store(u.store),
tariffs(u.tariffs),
tariff(u.tariff),
+ m_services(u.m_services),
traffStat(u.traffStat),
traffStatSaved(u.traffStatSaved),
settings(u.settings),
lastDisconnectReason = reason;
lastIPForDisconnect = currIP;
currIP = 0; // DelUser in traffcounter
+ if (connected)
+ Disconnect(false, "not authorized");
return;
}
}
{
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();
}