Send message parser was moved to a separate files.

[stg.git] / projects / sgconf / common_sg.cpp

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index c0a4fd252bca0f6524eae00b46ce291ded75e2d6..ca1aa50c0b5f5aabda5374478949dbb0ec0574d2 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -317,10 +317,10 @@ if (info.login == "")
     }
 
 if (!data->request.cash.res_empty())
-    cout << "cash=" << info.cash << endl;
+    cout << "cash = " << info.cash << endl;
 
 if (!data->request.credit.res_empty())
-    cout << "credit=" << info.credit << endl;
+    cout << "credit = " << info.credit << endl;
 
 if (!data->request.creditExpire.res_empty())
     {
@@ -339,38 +339,38 @@ if (!data->request.creditExpire.res_empty())
 
     strftime(buf, 32, "%Y-%m-%d", &brokenTime);
 
-    cout << "creditExpire=" << buf << endl;
+    cout << "creditExpire = " << buf << endl;
     }
 
 if (!data->request.down.res_empty())
-    cout << "down=" << info.down << endl;
+    cout << "down = " << info.down << endl;
 
 if (!data->request.passive.res_empty())
-    cout << "passive=" << info.passive << endl;
+    cout << "passive = " << info.passive << endl;
 
 if (!data->request.disableDetailStat.res_empty())
-    cout << "disableDetailStat=" << info.disableDetailStat << endl;
+    cout << "disableDetailStat = " << info.disableDetailStat << endl;
 
 if (!data->request.alwaysOnline.res_empty())
-    cout << "alwaysOnline=" << info.alwaysOnline << endl;
+    cout << "alwaysOnline = " << info.alwaysOnline << endl;
 
 if (!data->request.prepaidTraff.res_empty())
-    cout << "prepaidTraff=" << info.prepaidTraff << endl;
+    cout << "prepaidTraff = " << info.prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {
     if (!data->request.sessionUpload[i].res_empty())
-        cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
+        cout << "session upload for dir " << i << " = " << info.stat.su[i] << endl;
     if (!data->request.sessionDownload[i].res_empty())
-        cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
+        cout << "session download for dir " << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
     if (!data->request.monthUpload[i].res_empty())
-        cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
+        cout << "month upload for dir " << i << " = " << info.stat.mu[i] << endl;
     if (!data->request.monthDownload[i].res_empty())
-        cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
+        cout << "month download for dir " << i << " = " << info.stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
@@ -379,7 +379,7 @@ for (int i = 0; i < USERDATA_NUM; i++)
         {
         string str;
         ConvertFromKOI8(info.userData[i], &str);
-        cout << "userdata" << i << "=" << str << endl;
+        cout << "user data " << i << " = " << str << endl;
         }
     }
 
@@ -401,7 +401,7 @@ for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);
-        cout << strReqParams[i].name << "=" << str << endl;
+        cout << strReqParams[i].name << " = " << str << endl;
         }
     }
 data->result = true;
@@ -419,13 +419,10 @@ int ProcessSetUser(const std::string &server,
                    const std::string &admLogin,
                    const std::string &admPasswd,
                    const std::string &str,
-                   void * data,
                    bool isMessage)
 {
 SERVCONF sc;
 
-bool result = false;
-
 sc.SetServer(server.c_str());
 sc.SetPort(port);
 sc.SetAdmLogin(admLogin.c_str());
@@ -434,18 +431,19 @@ sc.SetAdmPassword(admPasswd.c_str());
 REQUEST request;
 GetUserData cbdata(request, false);
 
+int res = 0;
 if (isMessage)
     {
     sc.SetSendMessageCb(RecvSetUserAnswer, &cbdata);
-    sc.MsgUser(str.c_str());
+    res = sc.MsgUser(str.c_str());
     }
 else
     {
-    sc.SetChgUserCb(RecvSetUserAnswer, &cbdata);
-    sc.ChgUser(str.c_str());
+    sc.SetChgUserCallback(RecvSetUserAnswer, &cbdata);
+    res = sc.ChgUser(str.c_str());
     }
 
-if (result)
+if (res && cbdata.result)
     {
     printf("Ok\n");
     return 0;
@@ -477,9 +475,9 @@ sc.SetAdmPassword(admPasswd.c_str());
 GetUserData data(request, false);
 
 sc.SetGetUserCallback(GetUserCallback, &data);
-sc.GetUser(login.c_str());
+bool res = (sc.GetUser(login.c_str()) == st_ok);
 
-if (data.result)
+if (res && data.result)
     {
     printf("Ok\n");
     return 0;
@@ -497,8 +495,7 @@ int ProcessAuthBy(const std::string &server,
                   int port,
                   const std::string &admLogin,
                   const std::string &admPasswd,
-                  const std::string &login,
-                  REQUEST & request)
+                  const std::string &login)
 {
 SERVCONF sc;
 
@@ -508,9 +505,9 @@ sc.SetAdmLogin(admLogin.c_str());
 sc.SetAdmPassword(admPasswd.c_str());
 
 sc.SetAuthByCallback(RecvAuthByData, NULL);
-sc.AuthBy(login.c_str());
+bool res = (sc.AuthBy(login.c_str()) == st_ok);
 
-if (sc.GetError())
+if (!res)
     {
     printf("Error\n");
     return -1;