Revert "Merge remote-tracking branch 'origin/master' into ticket37"

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
index 2dbc9a7d8405279bcf10cef09f89e967adb60f9e..643f6e74561b07148684da47843eb12c17d230bb 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
@@ -1,3 +1,5 @@
+#include <ostream> // xmlrpc-c devs have missed something :)
+

 #include "stg/common.h"
 #include "admins_methods.h"
 #include "rpcconfig.h"
 #include "stg/common.h"
 #include "admins_methods.h"
 #include "rpcconfig.h"


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

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

     {
     structVal["result"] = xmlrpc_c::value_boolean(false);
     *retvalPtr = xmlrpc_c::value_struct(structVal);
     {
     structVal["result"] = xmlrpc_c::value_boolean(false);
     *retvalPtr = xmlrpc_c::value_struct(structVal);


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

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

     {
     printfd(__FILE__, "METHOD_ADMIN_ADD::execute(): 'Invalid admin (logged)'\n");
     *retvalPtr = xmlrpc_c::value_boolean(false);
     {
     printfd(__FILE__, "METHOD_ADMIN_ADD::execute(): 'Invalid admin (logged)'\n");
     *retvalPtr = xmlrpc_c::value_boolean(false);


@@ -93,7 +95,6 @@ std::string cookie = paramList.getString(0);
 std::string login = paramList.getString(1);
 paramList.verifyEnd(2);
 
 std::string login = paramList.getString(1);
 paramList.verifyEnd(2);
 

-std::map<std::string, xmlrpc_c::value> structVal;

 ADMIN_INFO adminInfo;
 
 if (config->GetAdminInfo(cookie, &adminInfo))
 ADMIN_INFO adminInfo;
 
 if (config->GetAdminInfo(cookie, &adminInfo))


@@ -104,7 +105,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;


@@ -139,7 +140,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * loggedAdmin;
 
 
 ADMIN * loggedAdmin;
 

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

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


@@ -147,7 +148,7 @@ if (admins->FindAdmin(adminInfo.admin, &loggedAdmin))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

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

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


@@ -221,14 +222,14 @@ void METHOD_ADMINS_GET::execute(xmlrpc_c::paramList const & paramList,
 std::string cookie = paramList.getString(0);
 paramList.verifyEnd(1);
 
 std::string cookie = paramList.getString(0);
 paramList.verifyEnd(1);
 

-std::map<std::string, xmlrpc_c::value> structVal;
+std::map<std::string, xmlrpc_c::value> mainStructVal;

 std::vector<xmlrpc_c::value> retval;
 ADMIN_INFO adminInfo;
 
 if (config->GetAdminInfo(cookie, &adminInfo))
     {
 std::vector<xmlrpc_c::value> retval;
 ADMIN_INFO adminInfo;
 
 if (config->GetAdminInfo(cookie, &adminInfo))
     {

-    structVal["result"] = xmlrpc_c::value_boolean(false);
-    *retvalPtr = xmlrpc_c::value_struct(structVal);
+    mainStructVal["result"] = xmlrpc_c::value_boolean(false);
+    *retvalPtr = xmlrpc_c::value_struct(mainStructVal);

     return;
     }
 
     return;
     }