Rename parameter's names

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 003aac2dc4652e8f4d05cc3829fa49c33e363a52..bc6aa92f772f4375453c2f669100a318572f1bc7 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -213,7 +213,6 @@ 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;

 
     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 63af98e1963933a6a2d2e837fe8a4349625ae230..fff3f58de26103710a4394f2398e1dbfbafb90c0 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1481,9 +1481,10 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const
         return stream.str();
         }
     if (name == "login")       return login;
         return stream.str();
         }
     if (name == "login")       return login;

-    if (name == "ip")          return currIP.ToString();
+    if (name == "currIP")      return currIP.ToString();

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

-    if (property.Exists(name)) return property.GetPropertyValue(name);
+    if (property.Exists(name)) 
+        return property.GetPropertyValue(name);

     else
         {
         WriteServLog("User’s parameter '%s' does not exist.", name.c_str());
     else
         {
         WriteServLog("User’s parameter '%s' does not exist.", name.c_str());

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

-

     std::string     GetEnabledDirs() const;
 
     void            OnAdd();
     std::string     GetEnabledDirs() const;
 
     void            OnAdd();

diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index 1bb6c51c51c9232c97333457d9907a8f351a98d3..a94b60a4215d22b1e10bc520e286ef866124822d 100644 (file)
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -28,7 +28,7 @@ USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
       realName    (conf.realName,     "realName",     false, false, GetStgLogger(), sd, properties),
       credit      (conf.credit,       "credit",       false, false, GetStgLogger(), sd, properties),
       creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd, properties),
       realName    (conf.realName,     "realName",     false, false, GetStgLogger(), sd, properties),
       credit      (conf.credit,       "credit",       false, false, GetStgLogger(), sd, properties),
       creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd, properties),

-      ips         (conf.ips,          "IP",           false, false, GetStgLogger(), sd, properties),
+      ips         (conf.ips,          "ips",          false, false, GetStgLogger(), sd, properties),

       userdata0   (conf.userdata[0],  "userdata0",    false, false, GetStgLogger(), sd, properties),
       userdata1   (conf.userdata[1],  "userdata1",    false, false, GetStgLogger(), sd, properties),
       userdata2   (conf.userdata[2],  "userdata2",    false, false, GetStgLogger(), sd, properties),
       userdata0   (conf.userdata[0],  "userdata0",    false, false, GetStgLogger(), sd, properties),
       userdata1   (conf.userdata[1],  "userdata1",    false, false, GetStgLogger(), sd, properties),
       userdata2   (conf.userdata[2],  "userdata2",    false, false, GetStgLogger(), sd, properties),