Add waiting for empty queue in rscriptd

[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..ff783471ab00f1d148439a2a2cafbb45498171a5 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"

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


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

-user_iter u;
+USER_PTR u;

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


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

-ADMIN admin;
+ADMIN * admin = NULL;

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


@@ -76,7 +78,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

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


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -120,9 +122,9 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     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);


@@ -156,7 +158,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)


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -212,7 +214,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

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


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -265,7 +267,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

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


@@ -273,10 +275,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;


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -315,7 +317,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

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


@@ -323,7 +325,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;


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -363,7 +365,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
     return;
     }
 
     return;
     }
 

-user_iter u;
+USER_PTR u;

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


@@ -375,10 +377,10 @@ 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))

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


@@ -387,10 +389,10 @@ if (tariffs->FindByName(tariff))
         }
     else
         {
         }
     else
         {

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

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


@@ -440,7 +442,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)