Removed "using namespace std;" from sgauth.

[stg.git] / projects / stargazer / user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 08087883a9fb0e94805413d2f922bac3ee15882d..7932198783197138cde33d1d7ef664e1af960f7f 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -32,12 +32,9 @@
 #define _GNU_SOURCE
 #endif
 
 #define _GNU_SOURCE
 #endif
 

-#include <pthread.h>
-#include <unistd.h> // access
-
-#include <cassert>
-#include <cstdlib>
-#include <cmath>
+#include "user_impl.h"
+#include "settings_impl.h"
+#include "stg_timer.h"

 
 #include "stg/users.h"
 #include "stg/common.h"
 
 #include "stg/users.h"
 #include "stg/common.h"


@@ -45,9 +42,16 @@
 #include "stg/tariff.h"
 #include "stg/tariffs.h"
 #include "stg/admin.h"
 #include "stg/tariff.h"
 #include "stg/tariffs.h"
 #include "stg/admin.h"

-#include "user_impl.h"
-#include "settings_impl.h"
-#include "stg_timer.h"
+
+#include <algorithm>
+#include <functional>
+
+#include <cassert>
+#include <cstdlib>
+#include <cmath>
+
+#include <pthread.h>
+#include <unistd.h> // access

 
 #ifdef USE_ABSTRACT_SETTINGS
 USER_IMPL::USER_IMPL(const SETTINGS * s,
 
 #ifdef USE_ABSTRACT_SETTINGS
 USER_IMPL::USER_IMPL(const SETTINGS * s,


@@ -60,12 +64,9 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),

-      login(),

       id(0),
       __connected(0),
       connected(__connected),
       id(0),
       __connected(0),
       connected(__connected),

-      enabledDirs(),
-      userIDGenerator(),

       __currIP(0),
       currIP(__currIP),
       lastIPForDisconnect(0),
       __currIP(0),
       currIP(__currIP),
       lastIPForDisconnect(0),


@@ -74,11 +75,8 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       store(st),
       tariffs(t),
       tariff(NULL),
       store(st),
       tariffs(t),
       tariff(NULL),

-      traffStat(),
-      traffStatSaved(),

       settings(s),
       settings(s),

-      authorizedBy(),
-      messages(),
+      authorizedModificationTime(0),

       deleted(false),
       lastWriteStat(0),
       lastWriteDetailedStat(0),
       deleted(false),
       lastWriteStat(0),
       lastWriteDetailedStat(0),


@@ -116,14 +114,11 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),

-      sessionUpload(),
-      sessionDownload(),

       passiveNotifier(this),
       passiveNotifier(this),

+      disabledNotifier(this),

       tariffNotifier(this),
       cashNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this),
-      mutex(),
-      errorStr()
+      ipNotifier(this)

 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;


@@ -153,12 +148,9 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),

-      login(),

       id(0),
       __connected(0),
       connected(__connected),
       id(0),
       __connected(0),
       connected(__connected),

-      enabledDirs(),
-      userIDGenerator(),

       __currIP(0),
       currIP(__currIP),
       lastIPForDisconnect(0),
       __currIP(0),
       currIP(__currIP),
       lastIPForDisconnect(0),


@@ -167,11 +159,8 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       store(st),
       tariffs(t),
       tariff(NULL),
       store(st),
       tariffs(t),
       tariff(NULL),

-      traffStat(),
-      traffStatSaved(),

       settings(s),
       settings(s),

-      authorizedBy(),
-      messages(),
+      authorizedModificationTime(0),

       deleted(false),
       lastWriteStat(0),
       lastWriteDetailedStat(0),
       deleted(false),
       lastWriteStat(0),
       lastWriteDetailedStat(0),


@@ -209,15 +198,11 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),

-      sessionUpload(),
-      sessionDownload(),

       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this),
-      mutex(),
-      errorStr()
+      ipNotifier(this)

 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;


@@ -248,7 +233,6 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       id(u.id),
       __connected(0),
       connected(__connected),
       id(u.id),
       __connected(0),
       connected(__connected),

-      enabledDirs(),

       userIDGenerator(u.userIDGenerator),
       __currIP(u.__currIP),
       currIP(__currIP),
       userIDGenerator(u.userIDGenerator),
       __currIP(u.__currIP),
       currIP(__currIP),


@@ -261,7 +245,7 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       traffStat(u.traffStat),
       traffStatSaved(u.traffStatSaved),
       settings(u.settings),
       traffStat(u.traffStat),
       traffStatSaved(u.traffStatSaved),
       settings(u.settings),

-      authorizedBy(),
+      authorizedModificationTime(u.authorizedModificationTime),

       messages(u.messages),
       deleted(u.deleted),
       lastWriteStat(u.lastWriteStat),
       messages(u.messages),
       deleted(u.deleted),
       lastWriteStat(u.lastWriteStat),


@@ -306,9 +290,7 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       disabledNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this),
-      mutex(),
-      errorStr()
+      ipNotifier(this)

 {
 if (&u == this)
     return;
 {
 if (&u == this)
     return;


@@ -338,7 +320,7 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 void USER_IMPL::SetLogin(const std::string & l)
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::SetLogin(const std::string & l)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 assert(login.empty() && "Login is already set");
 login = l;
 id = userIDGenerator.GetNextID();
 assert(login.empty() && "Login is already set");
 login = l;
 id = userIDGenerator.GetNextID();


@@ -346,7 +328,7 @@ id = userIDGenerator.GetNextID();
 //-----------------------------------------------------------------------------
 int USER_IMPL::ReadConf()
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::ReadConf()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 USER_CONF conf;
 
 if (store->RestoreUserConf(&conf, login))
 USER_CONF conf;
 
 if (store->RestoreUserConf(&conf, login))


@@ -394,7 +376,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USER_IMPL::ReadStat()
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::ReadStat()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 USER_STAT stat;
 
 if (store->RestoreUserStat(&stat, login))
 USER_STAT stat;
 
 if (store->RestoreUserStat(&stat, login))


@@ -413,7 +395,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteConf()
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteConf()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 USER_CONF conf(property.GetConf());
 
 printfd(__FILE__, "USER::WriteConf()\n");
 USER_CONF conf(property.GetConf());
 
 printfd(__FILE__, "USER::WriteConf()\n");


@@ -432,7 +414,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteStat()
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteStat()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 USER_STAT stat(property.GetStat());
 
 if (store->SaveUserStat(stat, login))
 USER_STAT stat(property.GetStat());
 
 if (store->SaveUserStat(stat, login))


@@ -451,7 +433,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteMonthStat()
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::WriteMonthStat()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 time_t tt = stgTime - 3600;
 struct tm t1;
 localtime_r(&tt, &t1);
 time_t tt = stgTime - 3600;
 struct tm t1;
 localtime_r(&tt, &t1);


@@ -471,7 +453,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USER_IMPL::Authorize(uint32_t ip, uint32_t dirs, const AUTH * auth)
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::Authorize(uint32_t ip, uint32_t dirs, const AUTH * auth)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 /*
  *  Authorize user. It only means that user will be authorized. Nothing more.
  *  User can be connected or disconnected while authorized.
 /*
  *  Authorize user. It only means that user will be authorized. Nothing more.
  *  User can be connected or disconnected while authorized.


@@ -535,6 +517,8 @@ else
         }
     }
 
         }
     }
 

+if (authorizedBy.empty())
+    authorizedModificationTime = stgTime;

 authorizedBy.insert(auth);
 
 ScanMessage();
 authorizedBy.insert(auth);
 
 ScanMessage();


@@ -542,9 +526,9 @@ ScanMessage();
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void USER_IMPL::Unauthorize(const AUTH * auth)
+void USER_IMPL::Unauthorize(const AUTH * auth, const std::string & reason)

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 /*
  *  Authorizer tries to unauthorize user, that was not authorized by it
  */
 /*
  *  Authorizer tries to unauthorize user, that was not authorized by it
  */


@@ -553,6 +537,8 @@ if (!authorizedBy.erase(auth))
 
 if (authorizedBy.empty())
     {
 
 if (authorizedBy.empty())
     {

+    authorizedModificationTime = stgTime;
+    lastDisconnectReason = reason;

     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter
     return;
     lastIPForDisconnect = currIP;
     currIP = 0; // DelUser in traffcounter
     return;


@@ -561,18 +547,25 @@ if (authorizedBy.empty())
 //-----------------------------------------------------------------------------
 bool USER_IMPL::IsAuthorizedBy(const AUTH * auth) const
 {
 //-----------------------------------------------------------------------------
 bool USER_IMPL::IsAuthorizedBy(const AUTH * auth) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 //  Is this user authorized by specified authorizer?
 return authorizedBy.find(auth) != authorizedBy.end();
 }
 //-----------------------------------------------------------------------------
 //  Is this user authorized by specified authorizer?
 return authorizedBy.find(auth) != authorizedBy.end();
 }
 //-----------------------------------------------------------------------------

+std::vector<std::string> USER_IMPL::GetAuthorizers() const
+{
+    std::vector<std::string> list;
+    std::transform(authorizedBy.begin(), authorizedBy.end(), std::back_inserter(list), std::mem_fun(&AUTH::GetVersion));
+    return list;
+}
+//-----------------------------------------------------------------------------

 void USER_IMPL::Connect(bool fakeConnect)
 {
 /*
  *  Connect user to Internet. This function is differ from Authorize() !!!
  */
 
 void USER_IMPL::Connect(bool fakeConnect)
 {
 /*
  *  Connect user to Internet. This function is differ from Authorize() !!!
  */
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (!fakeConnect)
     {
 
 if (!fakeConnect)
     {


@@ -631,7 +624,7 @@ void USER_IMPL::Disconnect(bool fakeDisconnect, const std::string & reason)
  *  Disconnect user from Internet. This function is differ from UnAuthorize() !!!
  */
 
  *  Disconnect user from Internet. This function is differ from UnAuthorize() !!!
  */
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (!lastIPForDisconnect)
     {
 
 if (!lastIPForDisconnect)
     {


@@ -641,6 +634,7 @@ if (!lastIPForDisconnect)
 
 if (!fakeDisconnect)
     {
 
 if (!fakeDisconnect)
     {

+    lastDisconnectReason = reason;

     std::string scriptOnDisonnect = settings->GetScriptsDir() + "/OnDisconnect";
 
     if (access(scriptOnDisonnect.c_str(), X_OK) == 0)
     std::string scriptOnDisonnect = settings->GetScriptsDir() + "/OnDisconnect";
 
     if (access(scriptOnDisonnect.c_str(), X_OK) == 0)


@@ -679,7 +673,12 @@ if (!fakeDisconnect)
     connected = false;
     }
 
     connected = false;
     }
 

-if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, cash, freeMb, reason))
+std::string reasonMessage(reason);
+if (!lastDisconnectReason.empty())
+    reasonMessage += ": " + lastDisconnectReason;
+
+if (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());
     {
     WriteServLog("Cannot write disconnect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());


@@ -692,12 +691,14 @@ DIR_TRAFF zeroSesssion;
 
 sessionUpload = zeroSesssion;
 sessionDownload = zeroSesssion;
 
 sessionUpload = zeroSesssion;
 sessionDownload = zeroSesssion;

+sessionUploadModTime = stgTime;
+sessionDownloadModTime = stgTime;

 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::PrintUser() const
 {
 //return;
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::PrintUser() const
 {
 //return;

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 std::cout << "============================================================" << std::endl;
 std::cout << "id=" << id << std::endl;
 std::cout << "login=" << login << std::endl;
 std::cout << "============================================================" << std::endl;
 std::cout << "id=" << id << std::endl;
 std::cout << "login=" << login << std::endl;


@@ -733,7 +734,7 @@ std::cout << "============================================================" << s
 //-----------------------------------------------------------------------------
 void USER_IMPL::Run()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::Run()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (stgTime > static_cast<time_t>(lastWriteStat + settings->GetStatWritePeriod()))
     {
 
 if (stgTime > static_cast<time_t>(lastWriteStat + settings->GetStatWritePeriod()))
     {


@@ -794,7 +795,7 @@ else
 //-----------------------------------------------------------------------------
 void USER_IMPL::UpdatePingTime(time_t t)
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::UpdatePingTime(time_t t)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 //printfd(__FILE__, "UpdatePingTime(%d) %s\n", t, login.c_str());
 if (t)
     pingTime = t;
 //printfd(__FILE__, "UpdatePingTime(%d) %s\n", t, login.c_str());
 if (t)
     pingTime = t;


@@ -804,7 +805,7 @@ else
 //-----------------------------------------------------------------------------
 bool USER_IMPL::IsInetable()
 {
 //-----------------------------------------------------------------------------
 bool USER_IMPL::IsInetable()
 {

-//STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+//STG_LOCKER lock(&mutex);

 
 if (disabled || passive)
     return false;
 
 if (disabled || passive)
     return false;


@@ -823,9 +824,9 @@ if (settings->GetShowFeeInCash() || tariff == NULL)
 return (cash - tariff->GetFee() >= -credit);
 }
 //-----------------------------------------------------------------------------
 return (cash - tariff->GetFee() >= -credit);
 }
 //-----------------------------------------------------------------------------

-std::string USER_IMPL::GetEnabledDirs()
+std::string USER_IMPL::GetEnabledDirs() const

 {
 {

-//STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+//STG_LOCKER lock(&mutex);

 
 std::string dirs = "";
 for(int i = 0; i < DIR_NUM; i++)
 
 std::string dirs = "";
 for(int i = 0; i < DIR_NUM; i++)


@@ -839,7 +840,7 @@ void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len)
 void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint32_t len)
 #endif
 {
 void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint32_t len)
 #endif
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (!connected || tariff == NULL)
     return;
 
 if (!connected || tariff == NULL)
     return;


@@ -853,10 +854,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024;
 dt[dir] += len;
 
 int tt = tariff->GetTraffType();
 dt[dir] += len;
 
 int tt = tariff->GetTraffType();

-if (tt == TRAFF_UP ||
-    tt == TRAFF_UP_DOWN ||
+if (tt == TARIFF::TRAFF_UP ||
+    tt == TARIFF::TRAFF_UP_DOWN ||

     // Check NEW traff data
     // Check NEW traff data

-    (tt == TRAFF_MAX && dt[dir] > down.ConstData()[dir]))
+    (tt == TARIFF::TRAFF_MAX && dt[dir] > down.ConstData()[dir]))

     {
     double dc = 0;
     if (traff < threshold &&
     {
     double dc = 0;
     if (traff < threshold &&


@@ -897,6 +898,7 @@ if (tt == TRAFF_UP ||
 
 up = dt;
 sessionUpload[dir] += len;
 
 up = dt;
 sessionUpload[dir] += len;

+sessionUploadModTime = stgTime;

 
 //Add detailed stat
 
 
 //Add detailed stat
 


@@ -931,7 +933,7 @@ void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len)
 void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint32_t len)
 #endif
 {
 void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint32_t len)
 #endif
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (!connected || tariff == NULL)
     return;
 
 if (!connected || tariff == NULL)
     return;


@@ -945,10 +947,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024;
 dt[dir] += len;
 
 int tt = tariff->GetTraffType();
 dt[dir] += len;
 
 int tt = tariff->GetTraffType();

-if (tt == TRAFF_DOWN ||
-    tt == TRAFF_UP_DOWN ||
+if (tt == TARIFF::TRAFF_DOWN ||
+    tt == TARIFF::TRAFF_UP_DOWN ||

     // Check NEW traff data
     // Check NEW traff data

-    (tt == TRAFF_MAX && up.ConstData()[dir] <= dt[dir]))
+    (tt == TARIFF::TRAFF_MAX && up.ConstData()[dir] <= dt[dir]))

     {
     double dc = 0;
     if (traff < threshold &&
     {
     double dc = 0;
     if (traff < threshold &&


@@ -988,6 +990,7 @@ if (tt == TRAFF_DOWN ||
 
 down = dt;
 sessionDownload[dir] += len;
 
 down = dt;
 sessionDownload[dir] += len;

+sessionDownloadModTime = stgTime;

 
 //Add detailed stat
 
 
 //Add detailed stat
 


@@ -1018,55 +1021,55 @@ else
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier)
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 currIP.AddBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier)
 {
 currIP.AddBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 currIP.DelBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier)
 {
 currIP.DelBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 currIP.AddAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier)
 {
 currIP.AddAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 currIP.DelAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier)
 {
 currIP.DelAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 connected.AddBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier)
 {
 connected.AddBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 connected.DelBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier)
 {
 connected.DelBeforeNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 connected.AddAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier)
 {
 connected.AddAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 connected.DelAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnAdd()
 {
 connected.DelAfterNotifier(notifier);
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnAdd()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 std::string scriptOnAdd = settings->GetScriptsDir() + "/OnUserAdd";
 
 
 std::string scriptOnAdd = settings->GetScriptsDir() + "/OnUserAdd";
 


@@ -1088,7 +1091,7 @@ else
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnDelete()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnDelete()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 std::string scriptOnDel = settings->GetScriptsDir() + "/OnUserDel";
 
 
 std::string scriptOnDel = settings->GetScriptsDir() + "/OnUserDel";
 


@@ -1129,7 +1132,7 @@ if (!traffStatSaved.second.empty())
 TRAFF_STAT ts;
 
     {
 TRAFF_STAT ts;
 
     {

-    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    STG_LOCKER lock(&mutex);

     ts.swap(traffStat);
     }
 
     ts.swap(traffStat);
     }
 


@@ -1145,7 +1148,7 @@ if (ts.size() && !disabledDetailStat)
         if (!hard)
             {
             printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n");
         if (!hard)
             {
             printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n");

-            STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+            STG_LOCKER lock(&mutex);

             traffStatSaved.second.swap(ts);
             traffStatSaved.first = lastWriteDetailedStat;
             }
             traffStatSaved.second.swap(ts);
             traffStatSaved.first = lastWriteDetailedStat;
             }


@@ -1158,7 +1161,7 @@ return 0;
 //-----------------------------------------------------------------------------
 double USER_IMPL::GetPassiveTimePart() const
 {
 //-----------------------------------------------------------------------------
 double USER_IMPL::GetPassiveTimePart() const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 static int daysInMonth[12] =
 {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
 static int daysInMonth[12] =
 {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};


@@ -1185,7 +1188,7 @@ return static_cast<double>(dt) / secMonth;
 //-----------------------------------------------------------------------------
 void USER_IMPL::SetPassiveTimeAsNewUser()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::SetPassiveTimeAsNewUser()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 time_t t = stgTime;
 struct tm tm;
 
 time_t t = stgTime;
 struct tm tm;


@@ -1199,7 +1202,7 @@ passiveTime = static_cast<time_t>(pt * 24 * 3600 * daysCurrMon);
 //-----------------------------------------------------------------------------
 void USER_IMPL::MidnightResetSessionStat()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::MidnightResetSessionStat()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (connected)
     {
 
 if (connected)
     {


@@ -1210,7 +1213,7 @@ if (connected)
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessNewMonth()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessNewMonth()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 //  Reset traff
 if (connected)
     {
 //  Reset traff
 if (connected)
     {


@@ -1250,11 +1253,14 @@ if (nextTariff.ConstData() != "")
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessDayFeeSpread()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessDayFeeSpread()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (passive.ConstData() || tariff == NULL)
     return;
 
 
 if (passive.ConstData() || tariff == NULL)
     return;
 

+if (tariff->GetPeriod() != TARIFF::MONTH)
+    return;
+

 double fee = tariff->GetFee() / DaysInCurrentMonth();
 
 if (std::fabs(fee) < 1.0e-3)
 double fee = tariff->GetFee() / DaysInCurrentMonth();
 
 if (std::fabs(fee) < 1.0e-3)


@@ -1284,11 +1290,14 @@ ResetPassiveTime();
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessDayFee()
 {
 //-----------------------------------------------------------------------------
 void USER_IMPL::ProcessDayFee()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (tariff == NULL)
     return;
 
 
 if (tariff == NULL)
     return;
 

+if (tariff->GetPeriod() != TARIFF::MONTH)
+    return;
+

 double passiveTimePart = 1.0;
 if (!settings->GetFullFee())
     {
 double passiveTimePart = 1.0;
 if (!settings->GetFullFee())
     {


@@ -1350,6 +1359,39 @@ switch (settings->GetFeeChargeType())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+void USER_IMPL::ProcessDailyFee()
+{
+STG_LOCKER lock(&mutex);
+
+if (passive.ConstData() || tariff == NULL)
+    return;
+
+if (tariff->GetPeriod() != TARIFF::DAY)
+    return;
+
+double fee = tariff->GetFee();
+
+if (fee == 0.0)
+    return;
+
+double c = cash;
+switch (settings->GetFeeChargeType())
+    {
+    case 0:
+        property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
+        break;
+    case 1:
+        if (c + credit >= 0)
+            property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
+        break;
+    case 2:
+        if (c + credit >= fee)
+            property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
+        break;
+    }
+ResetPassiveTime();
+}
+//-----------------------------------------------------------------------------

 void USER_IMPL::SetPrepaidTraff()
 {
 if (tariff != NULL)
 void USER_IMPL::SetPrepaidTraff()
 {
 if (tariff != NULL)


@@ -1358,7 +1400,7 @@ if (tariff != NULL)
 //-----------------------------------------------------------------------------
 int USER_IMPL::AddMessage(STG_MSG * msg)
 {
 //-----------------------------------------------------------------------------
 int USER_IMPL::AddMessage(STG_MSG * msg)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (SendMessage(*msg))
     {
 
 if (SendMessage(*msg))
     {


@@ -1474,40 +1516,24 @@ while (it != messages.end())
 //-----------------------------------------------------------------------------
 std::string USER_IMPL::GetParamValue(const std::string & name) const
 {
 //-----------------------------------------------------------------------------
 std::string USER_IMPL::GetParamValue(const std::string & name) const
 {

-if (name == "id")
-    {
-    std::stringstream stream;
-    stream << id;
-    return stream.str();;
-    }
-if (name == "login")        return login;
-if (name == "ip")           return currIP.ToString();
-return property.GetPropertyValue(name);
-//if (name == "freeMb")       return property.freeMb.ToString();
-//if (name == "passive")      return property.passive.ToString();
-//if (name == "disabled")     return property.disabled.ToString();
-//if (name == "alwaysOnline") return property.alwaysOnline.ToString();
-//if (name == "tariffName")   return property.tariffName;
-//if (name == "nextTariff")   return property.nextTariff;
-//if (name == "address")      return property.address;
-//if (name == "note")         return property.note;
-//if (name == "group")        return property.group;
-//if (name == "email")        return property.email;
-//if (name == "phone")        return property.phone;
-//if (name == "realName")     return property.realName;
-//if (name == "credit")       return property.credit.ToString();
-//if (name == "userdata0")    return property.userdata0;
-//if (name == "userdata1")    return property.userdata1;
-//if (name == "userdata2")    return property.userdata2;
-//if (name == "userdata3")    return property.userdata3;
-//if (name == "userdata4")    return property.userdata4;
-//if (name == "userdata5")    return property.userdata5;
-//if (name == "userdata6")    return property.userdata6;
-//if (name == "userdata7")    return property.userdata7;
-//if (name == "userdata8")    return property.userdata8;
-//if (name == "userdata9")    return property.userdata9;
-//if (name == "cash")         return property.cash.ToString();
-//return "";
+    std::string lowerName = ToLower(name);
+    if (lowerName == "id")
+        {
+        std::ostringstream stream;
+        stream << id;
+        return stream.str();
+        }
+    if (lowerName == "login")       return login;
+    if (lowerName == "currip")      return currIP.ToString();
+    if (lowerName == "enableddirs") return GetEnabledDirs();
+    if (lowerName == "tariff")      return property.tariffName;
+    if (property.Exists(lowerName))
+        return property.GetPropertyValue(lowerName);
+    else
+        {
+        WriteServLog("User’s parameter '%s' does not exist.", name.c_str());
+        return "";
+        }

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------