X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/64b687f8ec36a103865044613cb0f42f98aeda3a..cd0bf130b165970760884e279bb4301d3f6946ca:/projects/stargazer/user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 7b0348bc..f15b182a 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -821,7 +821,7 @@ if (settings->GetShowFeeInCash() || tariff == NULL)
 return (cash - tariff->GetFee() >= -credit);
 }
 //-----------------------------------------------------------------------------
-std::string USER_IMPL::GetEnabledDirs()
+std::string USER_IMPL::GetEnabledDirs() const
 {
 //STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
@@ -1253,6 +1253,9 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 if (passive.ConstData() || tariff == NULL)
     return;
 
+if (tariff->GetPeriod() != TARIFF::MONTH)
+    return;
+
 double fee = tariff->GetFee() / DaysInCurrentMonth();
 
 if (std::fabs(fee) < 1.0e-3)
@@ -1287,6 +1290,9 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 if (tariff == NULL)
     return;
 
+if (tariff->GetPeriod() != TARIFF::MONTH)
+    return;
+
 double passiveTimePart = 1.0;
 if (!settings->GetFullFee())
     {
@@ -1348,6 +1354,39 @@ switch (settings->GetFeeChargeType())
     }
 }
 //-----------------------------------------------------------------------------
+void USER_IMPL::ProcessDailyFee()
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+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)
@@ -1472,39 +1511,23 @@ while (it != messages.end())
 //-----------------------------------------------------------------------------
 std::string USER_IMPL::GetParamValue(const std::string & name) const
 {
-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();
-if (name == "id")
-    {
-    std::stringstream stream;
-    stream << id;
-    return stream.str();;
-    }
-if (name == "login")        return login;
-if (name == "ip")           return currIP.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 (property.Exists(lowerName))
+        return property.GetPropertyValue(lowerName);
+    else
+        {
+        WriteServLog("User’s parameter '%s' does not exist.", name.c_str());
+        return "";
+        }
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------