Remove some shit from common lib Makefile

[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 d6812f55235cb9b841fa492bac8781b465df32e9..0c28c60bfa2aaba30836e3165663bb5b397ea39f 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,11 +1,17 @@
+#include <cerrno>
+

 #include "users_methods.h"
 
 #include "users_methods.h"
 

+#include "users.h"
+#include "admins.h"
+#include "tariffs.h"
+

 #include "rpcconfig.h"
 #include "user_helper.h"
 #include "user_ips.h"
 #include "utils.h"
 #include "rpcconfig.h"
 #include "user_helper.h"
 #include "user_ips.h"
 #include "utils.h"

-

 #include "common.h"
 #include "common.h"

+#include "user_property.h"

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


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

-user_iter u;
+USER_PTR u;

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


@@ -65,7 +71,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))
     {


@@ -73,7 +79,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))
     {


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -117,9 +123,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);


@@ -153,7 +159,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)


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -209,7 +215,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))
     {


@@ -221,11 +227,11 @@ USER_HELPER uhelper(u);
 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {
 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {

-    uhelper.SetUserInfo(info, admin, login, *store);
+    uhelper.SetUserInfo(info, admin, login, *store, tariffs);

     }
 else
     {
     }
 else
     {

-    uhelper.SetUserInfo(info, admin, login, *store);
+    uhelper.SetUserInfo(info, admin, login, *store, tariffs);

     }
 
 u->WriteConf();
     }
 
 u->WriteConf();


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -262,7 +268,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))
     {


@@ -270,10 +276,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;


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -312,7 +318,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))
     {


@@ -320,7 +326,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;


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

-ADMIN admin;
+ADMIN * admin;

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


@@ -360,7 +366,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))
     {


@@ -372,24 +378,27 @@ 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);
             return;
             }
         }
             {
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             return;
             }
         }

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

         {
         {

-        u->WriteConf();
-        *retvalPtr = xmlrpc_c::value_boolean(true);
-        return;
+        if (u->GetProperty().tariffName.Set(tariff,
+                                            admin,
+                                            login,
+                                            store))
+            {
+            u->WriteConf();
+            *retvalPtr = xmlrpc_c::value_boolean(true);
+            return;
+            }

         }
     }
 
         }
     }
 


@@ -434,7 +443,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)