From: Naffanya <naffanya@naffanya.(none)>
Date: Thu, 10 Apr 2014 00:39:03 +0000 (+0300)
Subject: Rename tariff to tariffName
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/920fdb96809e7caae6a7cecc0ac8e5f7e26411c5?ds=inline;hp=-c

Rename tariff to tariffName
---

920fdb96809e7caae6a7cecc0ac8e5f7e26411c5
diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 30a3c171..47f35228 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1521,7 +1521,7 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const
     if (lowerName == "login")       return login;
     if (lowerName == "currip")      return currIP.ToString();
     if (lowerName == "enableddirs") return GetEnabledDirs();
-    if (lowerName == "tariffname")  return property.GetPropertyValue("tarrif");
+    if (lowerName == "tariff")      return property.tariffName;
     if (property.Exists(lowerName))
         return property.GetPropertyValue(lowerName);
     else
diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index feef2e59..1f04facc 100644
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -17,8 +17,8 @@ USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
       disabled    (conf.disabled,     "disabled",     false, false, GetStgLogger(), sd, properties),
       disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
       alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
-      tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd, properties),
-      nextTariff  (conf.nextTariff,   "nextTariff",  false, false, GetStgLogger(), sd, properties),
+      tariffName  (conf.tariffName,   "tariffName",       false, false, GetStgLogger(), sd, properties),
+      nextTariff  (conf.nextTariff,   "nextTariff",   false, false, GetStgLogger(), sd, properties),
       address     (conf.address,      "address",      false, false, GetStgLogger(), sd, properties),
       note        (conf.note,         "note",         false, false, GetStgLogger(), sd, properties),
       group       (conf.group,        "group",        false, false, GetStgLogger(), sd, properties),