Fix InetAccess authorization plugin compilation errors

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index cfaec55534aa7c5aa331f7a86cf2f9711d1fadf6..a4890e2c36a00a6f905ecbf9e218ce4c7d6f6ec3 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -1,25 +1,22 @@
 #include <cstdlib>
 #include <csignal>
 
-#include "rpcconfig.h"
+#include <vector>
+#include <algorithm>
 
-#include "../../../admin.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "../../../tariffs.h"
-#include "../../../traffcounter.h"
-#include "../../../settings.h"
-#include "base_store.h"
-#include "base_settings.h"
+#include "stg/common.h"
+#include "stg/admin.h"
+#include "stg/module_settings.h"
+#include "stg/settings.h"
 
+#include "rpcconfig.h"
 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"
 #include "admins_methods.h"
 #include "messages_methods.h"
 
-class RPC_CONFIG_CREATOR
-{
+class RPC_CONFIG_CREATOR {
 private:
     RPC_CONFIG * rpcconfig;
 
@@ -27,16 +24,16 @@ public:
     RPC_CONFIG_CREATOR()
         : rpcconfig(new RPC_CONFIG())
         {
-        };
+        }
     ~RPC_CONFIG_CREATOR()
         {
         delete rpcconfig;
-        };
+        }
 
     RPC_CONFIG * GetPlugin()
         {
         return rpcconfig;
-        };
+        }
 };
 
 RPC_CONFIG_CREATOR rpcc;
@@ -48,7 +45,7 @@ RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
 {
 }
 
-int RPC_CONFIG_SETTINGS::ParseIntInRange(const string & str,
+int RPC_CONFIG_SETTINGS::ParseIntInRange(const std::string & str,
                                          int min,
                                          int max,
                                          int * val)
@@ -70,10 +67,10 @@ int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;
 PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;
 
 pv.param = "Port";
-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'Port\' not found.";
@@ -89,7 +86,7 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
 port = p;
 
 pv.param = "CookieTimeout";
-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 if (pvi == s.moduleParams.end())
     {
     cookieTimeout = 1800; // 30 * 60
@@ -107,7 +104,7 @@ else
 return 0;
 }
 
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
 {
 return rpcc.GetPlugin();
 }
@@ -117,10 +114,10 @@ RPC_CONFIG::RPC_CONFIG()
       admins(NULL),
       tariffs(NULL),
       store(NULL),
-      stgSettings(NULL),
       rpcServer(NULL),
       running(false),
-      stopped(true)
+      stopped(true),
+      dayFee(0)
 {
 }
 
@@ -140,6 +137,15 @@ if (ret)
 return ret;
 }
 
+void RPC_CONFIG::SetStgSettings(const SETTINGS * settings)
+{
+    dayFee = settings->GetDayFee();
+    dirNames.erase(dirNames.begin(), dirNames.end());
+    for (size_t i = 0; i < DIR_NUM; ++i) {
+        dirNames.push_back(settings->GetDirName(i));
+    }
+}
+
 int RPC_CONFIG::Start()
 {
 InitiateRegistry();
@@ -231,7 +237,7 @@ bool RPC_CONFIG::CheckAdmin(const std::string & login,
                             const std::string & password,
                             std::string * cookie)
 {
-ADMIN admin;
+ADMIN * admin = NULL;
 
 if (!admins->AdminCorrect(login, password, &admin))
     {
@@ -241,7 +247,7 @@ if (!admins->AdminCorrect(login, password, &admin))
 ADMIN_INFO info;
 time(&info.accessTime);
 info.admin = login;
-info.priviledges = *admin.GetPriv();
+info.priviledges = *admin->GetPriv();
 *cookie = GetCookie();
 cookies[*cookie] = info;
 
@@ -284,7 +290,8 @@ void RPC_CONFIG::InitiateRegistry()
 xmlrpc_c::methodPtr const methodInfoPtr(new METHOD_INFO(
             tariffs,
             users,
-            stgSettings
+            dayFee,
+            dirNames
             ));
 rpcRegistry.addMethod("stargazer.info", methodInfoPtr);
 
@@ -339,7 +346,7 @@ xmlrpc_c::methodPtr const methodAddCashPtr(new METHOD_USER_CASH_ADD(
             store,
             users
             ));
-rpcRegistry.addMethod("stargazer.add_cash", methodAddCashPtr);
+rpcRegistry.addMethod("stargazer.add_user_cash", methodAddCashPtr);
 
 xmlrpc_c::methodPtr const methodSetCashPtr(new METHOD_USER_CASH_SET(
             this,
@@ -347,7 +354,7 @@ xmlrpc_c::methodPtr const methodSetCashPtr(new METHOD_USER_CASH_SET(
             store,
             users
             ));
-rpcRegistry.addMethod("stargazer.set_cash", methodSetCashPtr);
+rpcRegistry.addMethod("stargazer.set_user_cash", methodSetCashPtr);
 
 xmlrpc_c::methodPtr const methodTariffChangePtr(new METHOD_USER_TARIFF_CHANGE(
             this,
@@ -356,7 +363,7 @@ xmlrpc_c::methodPtr const methodTariffChangePtr(new METHOD_USER_TARIFF_CHANGE(
             store,
             users
             ));
-rpcRegistry.addMethod("stargazer.tariff_change", methodTariffChangePtr);
+rpcRegistry.addMethod("stargazer.chg_user_tariff", methodTariffChangePtr);
 
 xmlrpc_c::methodPtr const methodGetTariffPtr(new METHOD_TARIFF_GET(
             this,
@@ -426,7 +433,7 @@ xmlrpc_c::methodPtr const methodSendMessagePtr(new METHOD_MESSAGE_SEND(
             this,
             users
             ));
-rpcRegistry.addMethod("stargazer.send_message", methodSendMessagePtr);
+rpcRegistry.addMethod("stargazer.send_user_message", methodSendMessagePtr);
 
 xmlrpc_c::methodPtr const methodGetOnlinIPsPtr(new METHOD_GET_ONLINE_IPS(
             this,