Make fee charging rules inclusive (2 includes 0 and 3 includes fee)

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 547d18ed1ea6c59b5e0eecbf35d43a66ae485d67..ca2e2cae221ae28f2ed807c4e5924381873b8da6 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -58,10 +58,12 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
+      lastScanMessages(0),
       login(),
       id(0),
       __connected(0),
       connected(__connected),
+      enabledDirs(),
       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),
@@ -71,6 +73,14 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       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),
@@ -105,18 +115,18 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
+      sessionUpload(),
+      sessionDownload(),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()
 {
-settings = s;
-
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
-connected = 0;
 ips = StrToIPS("*");
-deleted = false;
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
@@ -125,8 +135,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
-lastScanMessages = 0;
-
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -134,18 +142,20 @@ 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)
+                     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),
@@ -155,6 +165,14 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       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),
@@ -189,18 +207,18 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
+      sessionUpload(),
+      sessionDownload(),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()
 {
-settings = s;
-
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
-connected = 0;
 ips = StrToIPS("*");
-deleted = false;
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
@@ -209,8 +227,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
-lastScanMessages = 0;
-
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -223,10 +239,13 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       users(u.users),
       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
+      lastScanMessages(0),
       login(u.login),
       id(u.id),
-      __connected(u.__connected),
+      __connected(0),
       connected(__connected),
+      enabledDirs(),
+      userIDGenerator(u.userIDGenerator),
       __currIP(u.__currIP),
       currIP(__currIP),
       lastIPForDisconnect(0),
@@ -235,6 +254,14 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       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),
@@ -269,30 +296,23 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
+      sessionUpload(),
+      sessionDownload(),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()
 {
 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.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
-lastScanMessages = 0;
-
 property.SetProperties(u.property);
 
 pthread_mutexattr_t attr;
@@ -464,7 +484,7 @@ for (int i = 0; i < DIR_NUM; i++)
     enabledDirs[i] = dirs & (1 << i);
     }
 
-if (authorizedBy.size())
+if (!authorizedBy.empty())
     {
     if (currIP != ip)
         {
@@ -1223,11 +1243,11 @@ switch (settings->GetFeeChargeType())
         property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 1:
-        if (c > 0)
+        if (c >= 0)
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 2:
-        if (c > fee)
+        if (c >= fee)
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     }
@@ -1277,14 +1297,14 @@ switch (settings->GetFeeChargeType())
         SetPrepaidTraff();
         break;
     case 1:
-        if (c > 0)
+        if (c >= 0)
             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();
             }
         break;
     case 2:
-        if (c > fee)
+        if (c >= fee)
             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();