Removing GetUserParam from rscript

diff --git a/include/stg/user.h b/include/stg/user.h
index 365c71ef1f0c53567e251e95c1dfe5da707f9f28..b7024859fe5bda31ec3c1e86448cc11a24d393ca 100644 (file)
--- a/include/stg/user.h
+++ b/include/stg/user.h
@@ -96,7 +96,7 @@ public:
     virtual time_t              GetLastWriteStatTime() const = 0;
 
     virtual bool                IsInetable() = 0;
     virtual time_t              GetLastWriteStatTime() const = 0;
 
     virtual bool                IsInetable() = 0;

-    virtual std::string         GetEnabledDirs() = 0;
+    virtual std::string         GetEnabledDirs() const = 0;

 
     virtual void                OnAdd() = 0;
     virtual void                OnDelete() = 0;
 
     virtual void                OnAdd() = 0;
     virtual void                OnDelete() = 0;

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index d5fab22243ef3b88f832d287ff7bf1d40e3b9fb1..fc733a67f4dcb744e99ecc3d623c9ada9648d496 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -426,7 +426,8 @@ for(it = rsSettings.GetUserParams().begin();
     it != rsSettings.GetUserParams().end();
     ++it)
     {
     it != rsSettings.GetUserParams().end();
     ++it)
     {

-    std::string parameter(GetUserParam(rsu.user, *it));
+//    std::string parameter(GetUserParam(rsu.user, *it));
+    std::string parameter(rsu.user->GetParamValue(it->c_str()));

     if (params.length() + parameter.length() > RS_PARAMS_LEN - 1)
         break;
     params += parameter + " ";
     if (params.length() + parameter.length() > RS_PARAMS_LEN - 1)
         break;
     params += parameter + " ";


@@ -515,85 +516,85 @@ for (size_t i = 0; i < netRouters.size(); ++i)
 return std::vector<uint32_t>();
 }
 //-----------------------------------------------------------------------------
 return std::vector<uint32_t>();
 }
 //-----------------------------------------------------------------------------

-std::string REMOTE_SCRIPT::GetUserParam(USER_PTR u, const std::string & paramName) const
-{
-std::string value = "";
-if (strcasecmp(paramName.c_str(), "cash") == 0)
-    strprintf(&value, "%f", u->GetProperty().cash.Get());
-else
-if (strcasecmp(paramName.c_str(), "freeMb") == 0)
-    strprintf(&value, "%f", u->GetProperty().freeMb.Get());
-else
-if (strcasecmp(paramName.c_str(), "passive") == 0)
-    strprintf(&value, "%d", u->GetProperty().passive.Get());
-else
-if (strcasecmp(paramName.c_str(), "disabled") == 0)
-    strprintf(&value, "%d", u->GetProperty().disabled.Get());
-else
-if (strcasecmp(paramName.c_str(), "alwaysOnline") == 0)
-    strprintf(&value, "%d", u->GetProperty().alwaysOnline.Get());
-else
-if (strcasecmp(paramName.c_str(), "tariffName") == 0 ||
-    strcasecmp(paramName.c_str(), "tariff") == 0)
-    value = "\"" + u->GetProperty().tariffName.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "nextTariff") == 0)
-    value = "\"" + u->GetProperty().nextTariff.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "address") == 0)
-    value = "\"" + u->GetProperty().address.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "note") == 0)
-    value = "\"" + u->GetProperty().note.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "group") == 0)
-    value = "\"" + u->GetProperty().group.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "email") == 0)
-    value = "\"" + u->GetProperty().email.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "realName") == 0)
-    value = "\"" + u->GetProperty().realName.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "credit") == 0)
-    strprintf(&value, "%f", u->GetProperty().credit.Get());
-else
-if (strcasecmp(paramName.c_str(), "userdata0") == 0)
-    value = "\"" + u->GetProperty().userdata0.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata1") == 0)
-    value = "\"" + u->GetProperty().userdata1.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata2") == 0)
-    value = "\"" + u->GetProperty().userdata2.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata3") == 0)
-    value = "\"" + u->GetProperty().userdata3.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata4") == 0)
-    value = "\"" + u->GetProperty().userdata4.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata5") == 0)
-    value = "\"" + u->GetProperty().userdata5.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata6") == 0)
-    value = "\"" + u->GetProperty().userdata6.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata7") == 0)
-    value = "\"" + u->GetProperty().userdata7.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata8") == 0)
-    value = "\"" + u->GetProperty().userdata8.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "userdata9") == 0)
-    value = "\"" + u->GetProperty().userdata9.Get() + "\"";
-else
-if (strcasecmp(paramName.c_str(), "enabledDirs") == 0)
-    value = u->GetEnabledDirs();
-else
-    printfd(__FILE__, "Unknown value name: %s\n", paramName.c_str());
-return value;
-}
+//std::string REMOTE_SCRIPT::GetUserParam(USER_PTR u, const std::string & paramName) const
+//{
+//std::string value = "";
+//if (strcasecmp(paramName.c_str(), "cash") == 0)
+//    strprintf(&value, "%f", u->GetProperty().cash.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "freeMb") == 0)
+//    strprintf(&value, "%f", u->GetProperty().freeMb.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "passive") == 0)
+//    strprintf(&value, "%d", u->GetProperty().passive.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "disabled") == 0)
+//    strprintf(&value, "%d", u->GetProperty().disabled.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "alwaysOnline") == 0)
+//    strprintf(&value, "%d", u->GetProperty().alwaysOnline.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "tariffName") == 0 ||
+//    strcasecmp(paramName.c_str(), "tariff") == 0)
+//    value = "\"" + u->GetProperty().tariffName.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "nextTariff") == 0)
+//    value = "\"" + u->GetProperty().nextTariff.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "address") == 0)
+//    value = "\"" + u->GetProperty().address.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "note") == 0)
+//    value = "\"" + u->GetProperty().note.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "group") == 0)
+//    value = "\"" + u->GetProperty().group.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "email") == 0)
+//    value = "\"" + u->GetProperty().email.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "realName") == 0)
+//    value = "\"" + u->GetProperty().realName.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "credit") == 0)
+//    strprintf(&value, "%f", u->GetProperty().credit.Get());
+//else
+//if (strcasecmp(paramName.c_str(), "userdata0") == 0)
+//    value = "\"" + u->GetProperty().userdata0.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata1") == 0)
+//    value = "\"" + u->GetProperty().userdata1.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata2") == 0)
+//    value = "\"" + u->GetProperty().userdata2.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata3") == 0)
+//    value = "\"" + u->GetProperty().userdata3.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata4") == 0)
+//    value = "\"" + u->GetProperty().userdata4.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata5") == 0)
+//    value = "\"" + u->GetProperty().userdata5.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata6") == 0)
+//    value = "\"" + u->GetProperty().userdata6.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata7") == 0)
+//    value = "\"" + u->GetProperty().userdata7.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata8") == 0)
+//    value = "\"" + u->GetProperty().userdata8.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "userdata9") == 0)
+//    value = "\"" + u->GetProperty().userdata9.Get() + "\"";
+//else
+//if (strcasecmp(paramName.c_str(), "enabledDirs") == 0)
+//    value = u->GetEnabledDirs();
+//else
+//    printfd(__FILE__, "Unknown value name: %s\n", paramName.c_str());
+//return value;
+//}

 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::SetUserNotifiers(USER_PTR u)
 {
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::SetUserNotifiers(USER_PTR u)
 {

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 8d22b458c870d72fba63ea61f3f7651134389ca7..003aac2dc4652e8f4d05cc3829fa49c33e363a52 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -213,7 +213,7 @@ private:
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();

-    std::string         GetUserParam(USER_PTR u, const std::string & paramName) const;
+//    std::string         GetUserParam(USER_PTR u, const std::string & paramName) const;

 
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(USER_PTR u);
 
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(USER_PTR u);

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index ac4dc9a9498aa62b0fa46bfed4f8218ec8f5a0fe..f3228738b92913039488bb568f4f845699ac717b 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -823,7 +823,7 @@ 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, __FILE__, __LINE__);
 


@@ -1478,10 +1478,11 @@ if (name == "id")
     {
     std::ostringstream stream;
     stream << id;
     {
     std::ostringstream stream;
     stream << id;

-    return stream.str();;
+    return stream.str();

     }
 if (name == "login")        return login;
 if (name == "ip")           return currIP.ToString();
     }
 if (name == "login")        return login;
 if (name == "ip")           return currIP.ToString();

+if (name == "enabledDirs")  return GetEnabledDirs();

 return property.GetPropertyValue(name);
 }
 //-----------------------------------------------------------------------------
 return property.GetPropertyValue(name);
 }
 //-----------------------------------------------------------------------------

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index d240f0c8c161ae85a42ddcd2d3fee522fe803181..eacf91ee5586907e0cd02390674460e307ec4ce5 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -211,7 +211,8 @@ public:
     void            ProcessNewMonth();
 
     bool            IsInetable();
     void            ProcessNewMonth();
 
     bool            IsInetable();

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

 
     void            OnAdd();
     void            OnDelete();
 
     void            OnAdd();
     void            OnDelete();