Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
index 281041e75767cad92690ef2228422eda0edf5ae9..e4d05636f67a0015c7641b46546eca9c37c46940 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
@@ -1,8 +1,12 @@
-#include "messages_methods.h"
+#include <ostream> // xmlrpc-c devs have missed something :)

 
 

-#include "rpcconfig.h"
-#include "stg_message.h"
+#include "stg/message.h"
+#include "stg/common.h"

 #include "utils.h"
 #include "utils.h"

+#include "messages_methods.h"
+#include "rpcconfig.h"
+
+extern const volatile time_t stgTime;

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


@@ -78,7 +82,7 @@ message.header.lastSendTime = 0;
 std::vector<xmlrpc_c::value>::iterator lit;
 for (lit = logins.begin(); lit != logins.end(); ++lit)
     {
 std::vector<xmlrpc_c::value>::iterator lit;
 for (lit = logins.begin(); lit != logins.end(); ++lit)
     {

-    user_iter ui;
+    USER_PTR ui;

     if (users->FindByName(xmlrpc_c::value_string(*lit), &ui))
         {
         printfd(__FILE__, "METHOD_MESSAGE_SEND::execute(): 'User '%s' not found'\n", std::string(xmlrpc_c::value_string(*lit)).c_str());
     if (users->FindByName(xmlrpc_c::value_string(*lit), &ui))
         {
         printfd(__FILE__, "METHOD_MESSAGE_SEND::execute(): 'User '%s' not found'\n", std::string(xmlrpc_c::value_string(*lit)).c_str());