Allow to start mod_rscript without subnets file

[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 72fb399e313d204caad6924fb8af551499fb4bbe..48ef3103123515633614d073fa2b0f9b445cefc7 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,14 +1,16 @@
-#include "users_methods.h"
+#include <cerrno>

 
 

-#include "../../../users.h"
-#include "../../../admins.h"
-#include "../../../tariffs.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"

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


@@ -17,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;


@@ -30,7 +31,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -57,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;


@@ -68,15 +68,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN admin;
+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;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -101,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;


@@ -112,17 +111,17 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-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;
     }
 

-user_iter 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);


@@ -139,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;


@@ -156,7 +154,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 bool hidePassword = !adminInfo.priviledges.userConf ||
                     !adminInfo.priviledges.userPasswd;
 
 bool hidePassword = !adminInfo.priviledges.userConf ||
                     !adminInfo.priviledges.userPasswd;
 

-user_iter u;
+USER_PTR u;

 
 int h = users->OpenSearch();
 if (!h)
 
 int h = users->OpenSearch();
 if (!h)


@@ -193,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;


@@ -204,15 +201,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-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;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -246,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;


@@ -257,15 +253,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-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;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -273,10 +269,10 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-double cash = u->property.cash.Get();
+double cash = u->GetProperty().cash.Get();

 cash += amount;
 
 cash += amount;
 

-if (!u->property.cash.Set(cash, admin, login, store, comment))
+if (!u->GetProperty().cash.Set(cash, admin, login, store, comment))

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


@@ -296,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;


@@ -307,15 +302,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-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;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -323,7 +318,7 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-if (!u->property.cash.Set(cash, admin, login, store, comment))
+if (!u->GetProperty().cash.Set(cash, admin, login, store, comment))

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


@@ -344,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;


@@ -355,15 +349,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-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;
     }
 

-user_iter u;
+USER_PTR u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -375,10 +369,11 @@ if (tariffs->FindByName(tariff))
     {
     if (delayed)
         {
     {
     if (delayed)
         {

-        if (u->property.nextTariff.Set(tariff,
-                                       admin,
-                                       login,
-                                       store))
+        if (u->GetProperty().nextTariff.Set(tariff,
+                                            admin,
+                                            login,
+                                            store,
+                                            comment))

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


@@ -387,11 +382,13 @@ if (tariffs->FindByName(tariff))
         }
     else
         {
         }
     else
         {

-        if (u->property.tariffName.Set(tariff,
-                                       admin,
-                                       login,
-                                       store))
+        if (u->GetProperty().tariffName.Set(tariff,
+                                            admin,
+                                            login,
+                                            store,
+                                            comment))

             {
             {

+            u->ResetNextTariff();

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


@@ -440,7 +437,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 std::vector<xmlrpc_c::value> ips;
 
 
 std::vector<xmlrpc_c::value> ips;
 

-user_iter u;
+USER_PTR u;

 
 int handle = users->OpenSearch();
 if (!handle)
 
 int handle = users->OpenSearch();
 if (!handle)