From: Naffanya Date: Sun, 28 Jul 2013 20:00:33 +0000 (+0300) Subject: Reduction in code in method GetParamValue, correcting methods USER_IMPL::Disconnect... X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/26c4dcb3c72ea51479f4ba47255eaa85a7affd32 Reduction in code in method GetParamValue, correcting methods USER_IMPL::Disconnect, USER_IMPL::Connect, USER_PROPERTY::ToString --- diff --git a/include/stg/user_property.h b/include/stg/user_property.h index d76326f1..1716296a 100644 --- a/include/stg/user_property.h +++ b/include/stg/user_property.h @@ -388,7 +388,6 @@ std::string USER_PROPERTY::ToString() const { std::stringstream stream; stream << value; -std::string stringValue = stream.str(); -return stringValue; +return stream.str(); } #endif // USER_PROPERTY_H diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 1af2b4de..c5629714 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -589,21 +589,21 @@ if (!fakeConnect) std::string scriptOnConnectParams; + strprintf(&scriptOnConnectParams, + "%s \"%s\" \"%s\" \"%f\" \"%d\" \"%s\"", + scriptOnConnect.c_str(), + login.c_str(), + inet_ntostring(currIP).c_str(), + cash.ConstData(), + id, + dirsStr); + std::vector::const_iterator it(settings->GetScriptParams().begin()); while (it != settings->GetScriptParams().end()) { scriptOnConnectParams += GetParamValue(it->c_str()); } -// strprintf(&scriptOnConnectParams, -// "%s \"%s\" \"%s\" \"%f\" \"%d\" \"%s\"", -// scriptOnConnect.c_str(), -// login.c_str(), -// inet_ntostring(currIP).c_str(), -// cash.ConstData(), -// id, -// dirsStr); - ScriptExec(scriptOnConnectParams.c_str()); } else @@ -661,6 +661,12 @@ if (!fakeDisconnect) id, dirsStr); + std::vector::const_iterator it(settings->GetScriptParams().begin()); + while (it != settings->GetScriptParams().end()) + { + scriptOnDisonnectParams += GetParamValue(it->c_str()); + } + ScriptExec(scriptOnDisonnectParams.c_str()); } else @@ -1466,116 +1472,38 @@ while (it != messages.end()) //----------------------------------------------------------------------------- std::string USER_IMPL::GetParamValue(const std::string & name) const { -if (name == "cash") - { - return property.cash.ToString(); - } -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(); - } +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(); } //----------------------------------------------------------------------------- //-----------------------------------------------------------------------------