X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9596c437646f369c3924dc78b20872762f3a47b9..f3555eaeee988c834b068f96bcc1ef7130b886de:/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp?ds=inline
diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
index 30205c92..665a04f4 100644
--- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
@@ -1,20 +1,18 @@
+#include <cmath>
+
+#include "stg/tariffs.h"
+#include "stg/admin.h"
+#include "stg/store.h"
+#include "stg/user_ips.h"
+#include "stg/common.h"
+#include "stg/user_property.h"
#include "user_helper.h"
-#include "tariffs.h"
-#include "admin.h"
-#include "store.h"
-#include "user_ips.h"
-#include "utils.h"
-#include "common.h"
-#include "user_property.h"
-
//------------------------------------------------------------------------------
void USER_HELPER::GetUserInfo(xmlrpc_c::value * info,
bool hidePassword)
{
-std::string enc;
-
std::map<std::string, xmlrpc_c::value> structVal;
structVal["result"] = xmlrpc_c::value_boolean(true);
@@ -76,7 +74,7 @@ structVal["group"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().group
structVal["status"] = xmlrpc_c::value_boolean(ptr->GetConnected());
structVal["aonline"] = xmlrpc_c::value_boolean(ptr->GetProperty().alwaysOnline.Get());
structVal["currip"] = xmlrpc_c::value_string(inet_ntostring(ptr->GetCurrIP()));
-structVal["pingtime"] = xmlrpc_c::value_int(ptr->GetPingTime());
+structVal["pingtime"] = xmlrpc_c::value_int(static_cast<int>(ptr->GetPingTime()));
structVal["ips"] = xmlrpc_c::value_string(ptr->GetProperty().ips.Get().GetIpStr());
std::map<std::string, xmlrpc_c::value> traffInfo;
@@ -118,9 +116,9 @@ structVal["down"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabled.Get());
structVal["disableddetailstat"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabledDetailStat.Get());
structVal["passive"] = xmlrpc_c::value_boolean(ptr->GetProperty().passive.Get());
structVal["lastcash"] = xmlrpc_c::value_double(ptr->GetProperty().lastCashAdd.Get());
-structVal["lasttimecash"] = xmlrpc_c::value_int(ptr->GetProperty().lastCashAddTime.Get());
-structVal["lastactivitytime"] = xmlrpc_c::value_int(ptr->GetProperty().lastActivityTime.Get());
-structVal["creditexpire"] = xmlrpc_c::value_int(ptr->GetProperty().creditExpire.Get());
+structVal["lasttimecash"] = xmlrpc_c::value_int(static_cast<int>(ptr->GetProperty().lastCashAddTime.Get()));
+structVal["lastactivitytime"] = xmlrpc_c::value_int(static_cast<int>(ptr->GetProperty().lastActivityTime.Get()));
+structVal["creditexpire"] = xmlrpc_c::value_int(static_cast<int>(ptr->GetProperty().creditExpire.Get()));
*info = xmlrpc_c::value_struct(structVal);
}
@@ -139,15 +137,24 @@ std::map<std::string, xmlrpc_c::value> structVal(
std::map<std::string, xmlrpc_c::value>::iterator it;
-if ((it = structVal.find("password")) != structVal.end())
+bool check = false;
+bool alwaysOnline = ptr->GetProperty().alwaysOnline;
+if ((it = structVal.find("aonline")) != structVal.end())
{
- std::string value(xmlrpc_c::value_string(it->second));
- if (ptr->GetProperty().password.Get() != value)
- if (!ptr->GetProperty().password.Set(value,
- admin,
- login,
- &store))
- return true;
+ check = true;
+ alwaysOnline = xmlrpc_c::value_boolean(it->second);
+ }
+bool onlyOneIP = ptr->GetProperty().ips.ConstData().OnlyOneIP();
+if ((it = structVal.find("ips")) != structVal.end())
+ {
+ check = true;
+ onlyOneIP = StrToIPS(xmlrpc_c::value_string(it->second)).OnlyOneIP();
+ }
+
+if (check && alwaysOnline && !onlyOneIP)
+ {
+ printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n");
+ return true;
}
if ((it = structVal.find("ips")) != structVal.end())
@@ -161,6 +168,28 @@ if ((it = structVal.find("ips")) != structVal.end())
return true;
}
+if ((it = structVal.find("aonline")) != structVal.end())
+ {
+ bool value(xmlrpc_c::value_boolean(it->second));
+ if (ptr->GetProperty().alwaysOnline.Get() != value)
+ if (!ptr->GetProperty().alwaysOnline.Set(value,
+ admin,
+ login,
+ &store))
+ return true;
+ }
+
+if ((it = structVal.find("password")) != structVal.end())
+ {
+ std::string value(xmlrpc_c::value_string(it->second));
+ if (ptr->GetProperty().password.Get() != value)
+ if (!ptr->GetProperty().password.Set(value,
+ admin,
+ login,
+ &store))
+ return true;
+ }
+
if ((it = structVal.find("address")) != structVal.end())
{
std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU"));
@@ -197,7 +226,7 @@ if ((it = structVal.find("email")) != structVal.end())
if ((it = structVal.find("cash")) != structVal.end())
{
double value(xmlrpc_c::value_double(it->second));
- if (ptr->GetProperty().cash.Get() != value)
+ if (std::fabs(ptr->GetProperty().cash.Get() - value) > 1.0e-3)
if (!ptr->GetProperty().cash.Set(value,
admin,
login,
@@ -219,7 +248,7 @@ if ((it = structVal.find("creditexpire")) != structVal.end())
if ((it = structVal.find("credit")) != structVal.end())
{
double value(xmlrpc_c::value_double(it->second));
- if (ptr->GetProperty().credit.Get() != value)
+ if (std::fabs(ptr->GetProperty().credit.Get() - value) > 1.0e-3)
if (!ptr->GetProperty().credit.Set(value,
admin,
login,
@@ -230,7 +259,7 @@ if ((it = structVal.find("credit")) != structVal.end())
if ((it = structVal.find("freemb")) != structVal.end())
{
double value(xmlrpc_c::value_double(it->second));
- if (ptr->GetProperty().freeMb.Get() != value)
+ if (std::fabs(ptr->GetProperty().freeMb.Get() - value) > 1.0e-3)
if (!ptr->GetProperty().freeMb.Set(value,
admin,
login,
@@ -260,17 +289,6 @@ if ((it = structVal.find("passive")) != structVal.end())
return true;
}
-if ((it = structVal.find("aonline")) != structVal.end())
- {
- bool value(xmlrpc_c::value_boolean(it->second));
- if (ptr->GetProperty().alwaysOnline.Get() != value)
- if (!ptr->GetProperty().alwaysOnline.Set(value,
- admin,
- login,
- &store))
- return true;
- }
-
if ((it = structVal.find("disableddetailstat")) != structVal.end())
{
bool value(xmlrpc_c::value_boolean(it->second));
@@ -317,7 +335,7 @@ if ((it = structVal.find("note")) != structVal.end())
if ((it = structVal.find("userdata")) != structVal.end())
{
- std::vector<USER_PROPERTY_LOGGED<string> *> userdata;
+ std::vector<USER_PROPERTY_LOGGED<std::string> *> userdata;
userdata.push_back(ptr->GetProperty().userdata0.GetPointer());
userdata.push_back(ptr->GetProperty().userdata1.GetPointer());
userdata.push_back(ptr->GetProperty().userdata2.GetPointer());