Lot of debug output for rscriptd.

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index d89bbe47a796bc9180371b840685a2bb82997e4e..41f3f567953a21bb8fd90f823df51962ba54b591 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -46,19 +46,24 @@
 #include "stg/admin.h"
 #include "user_impl.h"
 #include "settings_impl.h"
 #include "stg/admin.h"
 #include "user_impl.h"
 #include "settings_impl.h"

+#include "stg_timer.h"

 
 

-USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
+#ifdef USE_ABSTRACT_SETTINGS
+USER_IMPL::USER_IMPL(const SETTINGS * s,

            const STORE * st,
            const TARIFFS * t,
            const ADMIN * a,
            const USERS * u)
            const STORE * st,
            const TARIFFS * t,
            const ADMIN * a,
            const USERS * u)

-    : users(u),
+    : USER(),
+      users(u),

       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),

+      lastScanMessages(0),

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

+      enabledDirs(),

       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),
       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),


@@ -67,7 +72,15 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       sysAdmin(a),
       store(st),
       tariffs(t),
       sysAdmin(a),
       store(st),
       tariffs(t),

-      tariff(tariffs->GetNoTariff()),
+      tariff(NULL),
+      traffStat(),
+      traffStatSaved(),
+      settings(s),
+      authorizedBy(),
+      messages(),
+      deleted(false),
+      lastWriteStat(0),
+      lastWriteDetailedStat(0),

       cash(property.cash),
       up(property.up),
       down(property.down),
       cash(property.cash),
       up(property.up),
       down(property.down),


@@ -102,43 +115,140 @@ 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),
       tariffNotifier(this),
       cashNotifier(this),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

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

 {
 {

-settings = s;
-

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

-connected = 0;
-tariff = tariffs->GetNoTariff();

 ips = StrToIPS("*");
 ips = StrToIPS("*");

-deleted = false;

 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);

+property.disabled.AddAfterNotifier(&disabledNotifier);

 property.cash.AddBeforeNotifier(&cashNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);

-currIP.AddAfterNotifier(&ipNotifier);
+ips.AddAfterNotifier(&ipNotifier);

 
 

-lastScanMessages = 0;
+pthread_mutexattr_t attr;
+pthread_mutexattr_init(&attr);
+pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+pthread_mutex_init(&mutex, &attr);
+}
+#else
+USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
+                     const STORE * st,
+                     const TARIFFS * t,
+                     const ADMIN * a,
+                     const USERS * u)
+    : USER(),
+      users(u),
+      property(s->GetScriptsDir()),
+      WriteServLog(GetStgLogger()),
+      lastScanMessages(0),
+      login(),
+      id(0),
+      __connected(0),
+      connected(__connected),
+      enabledDirs(),
+      userIDGenerator(),
+      __currIP(0),
+      currIP(__currIP),
+      lastIPForDisconnect(0),
+      pingTime(0),
+      sysAdmin(a),
+      store(st),
+      tariffs(t),
+      tariff(NULL),
+      traffStat(),
+      traffStatSaved(),
+      settings(s),
+      authorizedBy(),
+      messages(),
+      deleted(false),
+      lastWriteStat(0),
+      lastWriteDetailedStat(0),
+      cash(property.cash),
+      up(property.up),
+      down(property.down),
+      lastCashAdd(property.lastCashAdd),
+      passiveTime(property.passiveTime),
+      lastCashAddTime(property.lastCashAddTime),
+      freeMb(property.freeMb),
+      lastActivityTime(property.lastActivityTime),
+      password(property.password),
+      passive(property.passive),
+      disabled(property.disabled),
+      disabledDetailStat(property.disabledDetailStat),
+      alwaysOnline(property.alwaysOnline),
+      tariffName(property.tariffName),
+      nextTariff(property.nextTariff),
+      address(property.address),
+      note(property.note),
+      group(property.group),
+      email(property.email),
+      phone(property.phone),
+      realName(property.realName),
+      credit(property.credit),
+      creditExpire(property.creditExpire),
+      ips(property.ips),
+      userdata0(property.userdata0),
+      userdata1(property.userdata1),
+      userdata2(property.userdata2),
+      userdata3(property.userdata3),
+      userdata4(property.userdata4),
+      userdata5(property.userdata5),
+      userdata6(property.userdata6),
+      userdata7(property.userdata7),
+      userdata8(property.userdata8),
+      userdata9(property.userdata9),
+      sessionUpload(),
+      sessionDownload(),
+      passiveNotifier(this),
+      disabledNotifier(this),
+      tariffNotifier(this),
+      cashNotifier(this),
+      ipNotifier(this),
+      mutex(),
+      errorStr()
+{
+password = "*_EMPTY_PASSWORD_*";
+tariffName = NO_TARIFF_NAME;
+ips = StrToIPS("*");
+lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
+lastWriteDetailedStat = stgTime;
+
+property.tariffName.AddBeforeNotifier(&tariffNotifier);
+property.passive.AddBeforeNotifier(&passiveNotifier);
+property.disabled.AddAfterNotifier(&disabledNotifier);
+property.cash.AddBeforeNotifier(&cashNotifier);
+ips.AddAfterNotifier(&ipNotifier);

 
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutex_init(&mutex, &attr);
 }
 
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutex_init(&mutex, &attr);
 }

+#endif

 //-----------------------------------------------------------------------------
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
 //-----------------------------------------------------------------------------
 USER_IMPL::USER_IMPL(const USER_IMPL & u)

-    : users(u.users),
+    : USER(),
+      users(u.users),

       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),

+      lastScanMessages(0),

       login(u.login),
       id(u.id),
       login(u.login),
       id(u.id),

-      __connected(u.__connected),
+      __connected(0),

       connected(__connected),
       connected(__connected),

+      enabledDirs(),
+      userIDGenerator(u.userIDGenerator),

       __currIP(u.__currIP),
       currIP(__currIP),
       lastIPForDisconnect(0),
       __currIP(u.__currIP),
       currIP(__currIP),
       lastIPForDisconnect(0),


@@ -147,6 +257,14 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),

+      traffStat(u.traffStat),
+      traffStatSaved(u.traffStatSaved),
+      settings(u.settings),
+      authorizedBy(),
+      messages(u.messages),
+      deleted(u.deleted),
+      lastWriteStat(u.lastWriteStat),
+      lastWriteDetailedStat(u.lastWriteDetailedStat),

       cash(property.cash),
       up(property.up),
       down(property.down),
       cash(property.cash),
       up(property.up),
       down(property.down),


@@ -181,29 +299,24 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       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)
+      ipNotifier(this),
+      mutex(),
+      errorStr()

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

-connected = 0;
-
-deleted = u.deleted;
-
-lastWriteStat = u.lastWriteStat;
-lastWriteDetailedStat = u.lastWriteDetailedStat;
-
-settings = u.settings;
-

 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);

+property.disabled.AddAfterNotifier(&disabledNotifier);

 property.cash.AddBeforeNotifier(&cashNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);

-currIP.AddAfterNotifier(&ipNotifier);
-
-lastScanMessages = 0;
+ips.AddAfterNotifier(&ipNotifier);

 
 property.SetProperties(u.property);
 
 
 property.SetProperties(u.property);
 


@@ -215,8 +328,10 @@ pthread_mutex_init(&mutex, &attr);
 //-----------------------------------------------------------------------------
 USER_IMPL::~USER_IMPL()
 {
 //-----------------------------------------------------------------------------
 USER_IMPL::~USER_IMPL()
 {

-property.passive.DelBeforeNotifier(&passiveNotifier);

 property.tariffName.DelBeforeNotifier(&tariffNotifier);
 property.tariffName.DelBeforeNotifier(&tariffNotifier);

+property.passive.DelBeforeNotifier(&passiveNotifier);
+property.disabled.DelAfterNotifier(&disabledNotifier);
+property.cash.DelBeforeNotifier(&cashNotifier);

 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------


@@ -257,6 +372,9 @@ std::vector<STG_MSG_HDR> hdrsList;
 if (store->GetMessageHdrs(&hdrsList, login))
     {
     printfd(__FILE__, "Error GetMessageHdrs %s\n", store->GetStrError().c_str());
 if (store->GetMessageHdrs(&hdrsList, login))
     {
     printfd(__FILE__, "Error GetMessageHdrs %s\n", store->GetStrError().c_str());

+    WriteServLog("Cannot read user %s. Error reading message headers: %s.",
+                 login.c_str(),
+                 store->GetStrError().c_str());

     return -1;
     }
 
     return -1;
     }
 


@@ -316,8 +434,6 @@ int USER_IMPL::WriteStat()
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 USER_STAT stat(property.GetStat());
 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 USER_STAT stat(property.GetStat());
 

-printfd(__FILE__, "USER::WriteStat()\n");
-

 if (store->SaveUserStat(stat, login))
     {
     WriteServLog("Cannot write stat for user %s.", login.c_str());
 if (store->SaveUserStat(stat, login))
     {
     WriteServLog("Cannot write stat for user %s.", login.c_str());


@@ -375,12 +491,12 @@ for (int i = 0; i < DIR_NUM; i++)
     enabledDirs[i] = dirs & (1 << i);
     }
 
     enabledDirs[i] = dirs & (1 << i);
     }
 

-if (authorizedBy.size())
+if (!authorizedBy.empty())

     {
     if (currIP != ip)
         {
         //  We are already authorized, but with different IP address
     {
     if (currIP != ip)
         {
         //  We are already authorized, but with different IP address

-        errorStr = "User " + login + " alredy authorized with IP address " + inet_ntostring(ip);
+        errorStr = "User " + login + " already authorized with IP address " + inet_ntostring(ip);

         return -1;
         }
 
         return -1;
         }
 


@@ -391,7 +507,7 @@ if (authorizedBy.size())
         //  If it's not our IP - throw an error
         if (u != this)
             {
         //  If it's not our IP - throw an error
         if (u != this)
             {

-            errorStr = "IP address " + inet_ntostring(ip) + " alredy in use";
+            errorStr = "IP address " + inet_ntostring(ip) + " already in use";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -401,7 +517,7 @@ else
     if (users->IsIPInIndex(ip))
         {
         //  Address is already present in IP-index
     if (users->IsIPInIndex(ip))
         {
         //  Address is already present in IP-index

-        errorStr = "IP address " + inet_ntostring(ip) + " alredy in use";
+        errorStr = "IP address " + inet_ntostring(ip) + " already in use";

         return -1;
         }
 
         return -1;
         }
 


@@ -480,7 +596,7 @@ if (!fakeConnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnConnectParams);
+        ScriptExec(scriptOnConnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -537,7 +653,7 @@ if (!fakeDisconnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnDisonnectParams);
+        ScriptExec(scriptOnDisonnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -683,7 +799,7 @@ if (settings->GetFreeMbAllowInet())
         return true;
     }
 
         return true;
     }
 

-if (settings->GetShowFeeInCash())
+if (settings->GetShowFeeInCash() || tariff == NULL)

     {
     return (cash >= -credit);
     }
     {
     return (cash >= -credit);
     }


@@ -709,7 +825,7 @@ void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint32_t len)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-if (!connected)
+if (!connected || tariff == NULL)

     return;
 
 double cost = 0;
     return;
 
 double cost = 0;


@@ -801,7 +917,7 @@ void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint32_t len)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-if (!connected)
+if (!connected || tariff == NULL)

     return;
 
 double cost = 0;
     return;
 
 double cost = 0;


@@ -884,52 +1000,52 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void USER_IMPL::AddCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> * n)
+void USER_IMPL::AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-currIP.AddBeforeNotifier(n);
+currIP.AddBeforeNotifier(notifier);

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

-void USER_IMPL::DelCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> * n)
+void USER_IMPL::DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-currIP.DelBeforeNotifier(n);
+currIP.DelBeforeNotifier(notifier);

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

-void USER_IMPL::AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> * n)
+void USER_IMPL::AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-currIP.AddAfterNotifier(n);
+currIP.AddAfterNotifier(notifier);

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

-void USER_IMPL::DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> * n)
+void USER_IMPL::DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-currIP.DelAfterNotifier(n);
+currIP.DelAfterNotifier(notifier);

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

-void USER_IMPL::AddConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> * n)
+void USER_IMPL::AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-connected.AddBeforeNotifier(n);
+connected.AddBeforeNotifier(notifier);

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

-void USER_IMPL::DelConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> * n)
+void USER_IMPL::DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-connected.DelBeforeNotifier(n);
+connected.DelBeforeNotifier(notifier);

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

-void USER_IMPL::AddConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> * n)
+void USER_IMPL::AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-connected.AddAfterNotifier(n);
+connected.AddAfterNotifier(notifier);

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

-void USER_IMPL::DelConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> * n)
+void USER_IMPL::DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-connected.DelAfterNotifier(n);
+connected.DelAfterNotifier(notifier);

 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnAdd()
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::OnAdd()


@@ -946,7 +1062,7 @@ if (access(scriptOnAdd.c_str(), X_OK) == 0)
             scriptOnAdd.c_str(),
             login.c_str());
 
             scriptOnAdd.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnAddParams);
+    ScriptExec(scriptOnAddParams.c_str());

     }
 else
     {
     }
 else
     {


@@ -968,7 +1084,7 @@ if (access(scriptOnDel.c_str(), X_OK) == 0)
             scriptOnDel.c_str(),
             login.c_str());
 
             scriptOnDel.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnDelParams);
+    ScriptExec(scriptOnDelParams.c_str());

     }
 else
     {
     }
 else
     {


@@ -1108,7 +1224,7 @@ if (nextTariff.ConstData() != "")
     else
         {
         property.tariffName.Set(nextTariff, sysAdmin, login, store);
     else
         {
         property.tariffName.Set(nextTariff, sysAdmin, login, store);

-        tariff = nt;
+        //tariff = nt;

         }
     ResetNextTariff();
     WriteConf();
         }
     ResetNextTariff();
     WriteConf();


@@ -1119,16 +1235,33 @@ void USER_IMPL::ProcessDayFeeSpread()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-if (passive.ConstData())
+if (passive.ConstData() || tariff == NULL)

     return;
 
     return;
 

-double f = tariff->GetFee() / DaysInCurrentMonth();
+double fee = tariff->GetFee() / DaysInCurrentMonth();

 
 

-if (f == 0.0)
+if (fee == 0.0)

     return;
 
 double c = cash;
     return;
 
 double c = cash;

-property.cash.Set(c - f, sysAdmin, login, store, "Subscriber fee charge");
+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;
+    case 3:
+        if (c >= 0)
+            property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
+        break;
+    }

 ResetPassiveTime();
 }
 //-----------------------------------------------------------------------------
 ResetPassiveTime();
 }
 //-----------------------------------------------------------------------------


@@ -1136,6 +1269,9 @@ void USER_IMPL::ProcessDayFee()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

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

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


@@ -1149,27 +1285,58 @@ else
         return;
         }
     }
         return;
         }
     }

-double f = tariff->GetFee() * passiveTimePart;
+double fee = tariff->GetFee() * passiveTimePart;

 
 ResetPassiveTime();
 
 
 ResetPassiveTime();
 

-if (f == 0.0)
+if (fee == 0.0)
+    {
+    SetPrepaidTraff();

     return;
     return;

+    }

 
 double c = cash;
 
 double c = cash;

-printfd(__FILE__, "login: %8s   Fee=%f PassiveTimePart=%f fee=%f\n",
+printfd(__FILE__, "login: %8s Cash=%f Credit=%f  Fee=%f PassiveTimePart=%f fee=%f\n",

         login.c_str(),
         login.c_str(),

+        cash.ConstData(),
+        credit.ConstData(),

         tariff->GetFee(),
         passiveTimePart,
         tariff->GetFee(),
         passiveTimePart,

-        f);
-property.cash.Set(c - f, sysAdmin, login, store, "Subscriber fee charge");
+        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()
 {
 }
 //-----------------------------------------------------------------------------
 void USER_IMPL::SetPrepaidTraff()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-property.freeMb.Set(tariff->GetFree(), sysAdmin, login, store, "Prepaid traffic");
+if (tariff != NULL)
+    property.freeMb.Set(tariff->GetFree(), sysAdmin, login, store, "Prepaid traffic");

 }
 //-----------------------------------------------------------------------------
 int USER_IMPL::AddMessage(STG_MSG * msg)
 }
 //-----------------------------------------------------------------------------
 int USER_IMPL::AddMessage(STG_MSG * msg)


@@ -1281,6 +1448,10 @@ while (it != messages.end())
             ++it;
             }
         }
             ++it;
             }
         }

+    else
+        {
+        ++it;
+        }

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


@@ -1288,7 +1459,7 @@ while (it != messages.end())
 //-----------------------------------------------------------------------------
 void CHG_PASSIVE_NOTIFIER::Notify(const int & oldPassive, const int & newPassive)
 {
 //-----------------------------------------------------------------------------
 void CHG_PASSIVE_NOTIFIER::Notify(const int & oldPassive, const int & newPassive)
 {

-if (newPassive && !oldPassive)
+if (newPassive && !oldPassive && user->tariff != NULL)

     user->property.cash.Set(user->cash - user->tariff->GetPassiveCost(),
                             user->sysAdmin,
                             user->login,
     user->property.cash.Set(user->cash - user->tariff->GetPassiveCost(),
                             user->sysAdmin,
                             user->login,


@@ -1296,9 +1467,28 @@ if (newPassive && !oldPassive)
                             "Freeze");
 }
 //-----------------------------------------------------------------------------
                             "Freeze");
 }
 //-----------------------------------------------------------------------------

+void CHG_DISABLED_NOTIFIER::Notify(const int & oldValue, const int & newValue)
+{
+if (oldValue && !newValue && user->GetConnected())
+    {
+    user->Disconnect(false, "disabled");
+    }
+else if (!oldValue && newValue && user->IsInetable())
+    {
+    user->Connect(false);
+    }
+
+}
+//-----------------------------------------------------------------------------

 void CHG_TARIFF_NOTIFIER::Notify(const string &, const string & newTariff)
 {
 void CHG_TARIFF_NOTIFIER::Notify(const string &, const string & newTariff)
 {

+if (user->settings->GetReconnectOnTariffChange() && user->connected)
+    user->Disconnect(false, "Change tariff");

 user->tariff = user->tariffs->FindByName(newTariff);
 user->tariff = user->tariffs->FindByName(newTariff);

+if (user->settings->GetReconnectOnTariffChange() &&
+    !user->authorizedBy.empty() &&
+    user->IsInetable())
+    user->Connect(false);

 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)


@@ -1307,14 +1497,12 @@ user->lastCashAddTime = *const_cast<time_t *>(&stgTime);
 user->lastCashAdd = newCash - oldCash;
 }
 //-----------------------------------------------------------------------------
 user->lastCashAdd = newCash - oldCash;
 }
 //-----------------------------------------------------------------------------

-void CHG_IP_NOTIFIER::Notify(const uint32_t & from, const uint32_t & to)
+void CHG_IPS_NOTIFIER::Notify(const USER_IPS & from, const USER_IPS & to)

 {
 {

-    printfd(__FILE__, "Change IP from %s to %s\n", inet_ntostring(from).c_str(), inet_ntostring(to).c_str());
-    if (from != 0)
-        if (user->connected)
-            user->Disconnect(false, "Change IP");
-    if (to != 0)
-        if (user->IsInetable())
-            user->Connect(false);
+    printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str());
+    if (user->connected)
+        user->Disconnect(false, "Change IP");
+    if (!user->authorizedBy.empty() && user->IsInetable())
+        user->Connect(false);

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