Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index d16d883f480d4be0ead41f829cec7bb15e393621..48ef3103123515633614d073fa2b0f9b445cefc7 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,17 +1,16 @@
 #include <cerrno>
 
 #include <cerrno>
 

-#include "users_methods.h"
-
-#include "users.h"
-#include "admins.h"
-#include "tariffs.h"
-#include "../../../user_property.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/user_ips.h"
+#include "stg/common.h"
+#include "stg/user_property.h"

 
 

+#include "users_methods.h"

 #include "rpcconfig.h"
 #include "user_helper.h"
 #include "rpcconfig.h"
 #include "user_helper.h"

-#include "user_ips.h"

 #include "utils.h"
 #include "utils.h"

-#include "common.h"

 
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 


@@ -20,7 +19,6 @@ void METHOD_USER_GET::execute(xmlrpc_c::paramList const & paramList,
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);

-std::string enc;

 paramList.verifyEnd(2);
 
 std::map<std::string, xmlrpc_c::value> structVal;
 paramList.verifyEnd(2);
 
 std::map<std::string, xmlrpc_c::value> structVal;


@@ -60,7 +58,6 @@ void METHOD_USER_ADD::execute(xmlrpc_c::paramList const & paramList,
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);

-std::string enc;

 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;


@@ -73,7 +70,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin = NULL;
 
 
 ADMIN * admin = NULL;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -104,7 +101,6 @@ void METHOD_USER_DEL::execute(xmlrpc_c::paramList const & paramList,
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 {
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);

-std::string enc;

 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;


@@ -117,7 +113,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -125,7 +121,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
 
 USER_PTR u;
 
 
 USER_PTR u;
 

-if (users->FindByName(login, &u))
+if (!users->FindByName(login, &u))

     {
     users->Del(login, admin);
     *retvalPtr = xmlrpc_c::value_boolean(true);
     {
     users->Del(login, admin);
     *retvalPtr = xmlrpc_c::value_boolean(true);


@@ -142,7 +138,6 @@ void METHOD_USERS_GET::execute(xmlrpc_c::paramList const & paramList,
                                xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);
                                xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);

-std::string enc;

 paramList.verifyEnd(1);
 
 std::map<std::string, xmlrpc_c::value> structVal;
 paramList.verifyEnd(1);
 
 std::map<std::string, xmlrpc_c::value> structVal;


@@ -196,7 +191,6 @@ void METHOD_USER_CHG::execute(xmlrpc_c::paramList const & paramList,
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 xmlrpc_c::value_struct info(paramList.getStruct(2));
 std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 xmlrpc_c::value_struct info(paramList.getStruct(2));

-std::string enc;

 paramList.verifyEnd(3);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(3);
 
 ADMIN_INFO adminInfo;


@@ -209,7 +203,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -249,7 +243,6 @@ std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 double amount = paramList.getDouble(2);
 std::string comment = IconvString(paramList.getString(3), "UTF-8", "KOI8-R");
 std::string login = paramList.getString(1);
 double amount = paramList.getDouble(2);
 std::string comment = IconvString(paramList.getString(3), "UTF-8", "KOI8-R");

-std::string enc;

 paramList.verifyEnd(4);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(4);
 
 ADMIN_INFO adminInfo;


@@ -262,7 +255,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -299,7 +292,6 @@ std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 double cash = paramList.getDouble(2);
 std::string comment = IconvString(paramList.getString(3), "UTF-8", "KOI8-R");
 std::string login = paramList.getString(1);
 double cash = paramList.getDouble(2);
 std::string comment = IconvString(paramList.getString(3), "UTF-8", "KOI8-R");

-std::string enc;

 paramList.verifyEnd(4);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(4);
 
 ADMIN_INFO adminInfo;


@@ -312,7 +304,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -347,7 +339,6 @@ std::string login = paramList.getString(1);
 std::string tariff = paramList.getString(2);
 bool delayed = paramList.getBoolean(3);
 std::string comment = IconvString(paramList.getString(4), "UTF-8", "KOI8-R");
 std::string tariff = paramList.getString(2);
 bool delayed = paramList.getBoolean(3);
 std::string comment = IconvString(paramList.getString(4), "UTF-8", "KOI8-R");

-std::string enc;

 paramList.verifyEnd(5);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(5);
 
 ADMIN_INFO adminInfo;


@@ -360,7 +351,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -381,7 +372,8 @@ if (tariffs->FindByName(tariff))
         if (u->GetProperty().nextTariff.Set(tariff,
                                             admin,
                                             login,
         if (u->GetProperty().nextTariff.Set(tariff,
                                             admin,
                                             login,

-                                            store))
+                                            store,
+                                            comment))

             {
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             {
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);


@@ -393,8 +385,10 @@ if (tariffs->FindByName(tariff))
         if (u->GetProperty().tariffName.Set(tariff,
                                             admin,
                                             login,
         if (u->GetProperty().tariffName.Set(tariff,
                                             admin,
                                             login,

-                                            store))
+                                            store,
+                                            comment))

             {
             {

+            u->ResetNextTariff();

             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             return;
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             return;