Correction of the container map

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index c5629714d4beaf6cf2de20b2625cd2bdb4a1eefe..b2ac841f96c5d43d4221fe319985a1d757d54a4b 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -601,7 +601,8 @@ if (!fakeConnect)
         std::vector<std::string>::const_iterator it(settings->GetScriptParams().begin());
         while (it != settings->GetScriptParams().end())
             {
-            scriptOnConnectParams  += GetParamValue(it->c_str());
+            scriptOnConnectParams += " \"" + GetParamValue(it->c_str()) + "\"";
+            ++it;
             }
 
         ScriptExec(scriptOnConnectParams.c_str());
@@ -664,7 +665,8 @@ if (!fakeDisconnect)
         std::vector<std::string>::const_iterator it(settings->GetScriptParams().begin());
         while (it != settings->GetScriptParams().end())
             {
-            scriptOnDisonnectParams += GetParamValue(it->c_str());
+            scriptOnDisonnectParams += " \"" + GetParamValue(it->c_str()) + "\"";
+            ++it;
             }
 
         ScriptExec(scriptOnDisonnectParams.c_str());
@@ -1472,38 +1474,40 @@ 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 == "id")
+    {
+    std::stringstream stream;
+    stream << id;
+    return stream.str();;
+    }
+    if (name == "login")        return login;
+    if (name == "ip")           return currIP.ToString();
+    return properties.GetPropertyValue(&name);    
+//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 "";
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------