Moved CHECK_USER parser from global scope.

[stg.git] / stglibs / srvconf.lib / parser_check_user.cpp

diff --git a/stglibs/srvconf.lib/parser_check_user.cpp b/stglibs/srvconf.lib/parser_check_user.cpp
index 0de1cedd95d30a61bc46093f466b3a15d11ea81c..0cb37522a66947e38ddead199ae4be338c322653 100644 (file)
--- a/stglibs/srvconf.lib/parser_check_user.cpp
+++ b/stglibs/srvconf.lib/parser_check_user.cpp
@@ -19,20 +19,22 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#include "stg/parser_check_user.h"
+#include "parser_check_user.h"
 
 #include <cstddef>
 
 #include <strings.h>
 
-PARSER_CHECK_USER::PARSER_CHECK_USER()
+using namespace STG;
+
+CHECK_USER::PARSER::PARSER()
     : callback(NULL),
       data(NULL),
       depth(0)
 {
 }
 //-----------------------------------------------------------------------------
-int PARSER_CHECK_USER::ParseStart(const char *el, const char **attr)
+int CHECK_USER::PARSER::ParseStart(const char * el, const char ** attr)
 {
 depth++;
 if (depth == 1)
@@ -41,19 +43,22 @@ if (depth == 1)
 return 0;
 }
 //-----------------------------------------------------------------------------
-void PARSER_CHECK_USER::ParseEnd(const char *)
+void CHECK_USER::PARSER::ParseEnd(const char *)
 {
 depth--;
 }
 //-----------------------------------------------------------------------------
-void PARSER_CHECK_USER::ParseAnswer(const char *, const char **attr)
+void CHECK_USER::PARSER::ParseAnswer(const char *, const char **attr)
 {
+if (!callback)
+    return;
 if (attr && attr[0] && attr[1] && strcasecmp(attr[0], "value") == 0)
-    if (callback)
-        callback(attr[1], data);
+    callback(strcasecmp(attr[1], "ok") == 0, attr[2] && attr[3] ? attr[3] : "", data);
+else
+    callback(false, "Invalid response.", data);
 }
 //-----------------------------------------------------------------------------
-void PARSER_CHECK_USER::SetCallback(CALLBACK f, void * d)
+void CHECK_USER::PARSER::SetCallback(CALLBACK f, void * d)
 {
 callback = f;
 data = d;