Added suboptions to tariffs and admins.

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

diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp
index cdbfbbb5acd838b281bf52852ee8a194ad69ee38..3e3660662f256cfc0d21a9d8e2443b095f15f7c6 100644 (file)
--- a/projects/sgconf/users.cpp
+++ b/projects/sgconf/users.cpp
@@ -1,5 +1,7 @@
 #include "users.h"
 
 #include "users.h"
 

+#include "api_action.h"
+#include "options.h"

 #include "config.h"
 
 #include "stg/servconf.h"
 #include "config.h"
 
 #include "stg/servconf.h"


@@ -7,6 +9,8 @@
 #include "stg/common.h"
 
 #include <iostream>
 #include "stg/common.h"
 
 #include <iostream>

+#include <string>
+#include <map>

 
 namespace
 {
 
 namespace
 {


@@ -25,9 +29,10 @@ std::cout << Indent(level, true) << "login: " << info.login << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n"
           << Indent(level)       << "credit: " << info.credit << "\n"
           << Indent(level)       << "credit expire: " << TimeToString(info.creditExpire) << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n"
           << Indent(level)       << "credit: " << info.credit << "\n"
           << Indent(level)       << "credit expire: " << TimeToString(info.creditExpire) << "\n"

-          << Indent(level)       << "last cash add: " << info.lastCash << "\n"
+          << Indent(level)       << "last cash add: " << info.lastCashAdd << "\n"
+          << Indent(level)       << "last cash add time: " << TimeToString(info.lastCashAddTime) << "\n"

           << Indent(level)       << "prepaid traffic: " << info.prepaidTraff << "\n"
           << Indent(level)       << "prepaid traffic: " << info.prepaidTraff << "\n"

-          << Indent(level)       << "disabled: " << (info.down ? "t" : "f") << "\n"
+          << Indent(level)       << "disabled: " << (info.disabled ? "t" : "f") << "\n"

           << Indent(level)       << "passive: " << (info.passive ? "t" : "f") << "\n"
           << Indent(level)       << "disabled detail stat: " << (info.disableDetailStat ? "t" : "f") << "\n"
           << Indent(level)       << "connected: " << (info.connected ? "t" : "f") << "\n"
           << Indent(level)       << "passive: " << (info.passive ? "t" : "f") << "\n"
           << Indent(level)       << "disabled detail stat: " << (info.disableDetailStat ? "t" : "f") << "\n"
           << Indent(level)       << "connected: " << (info.connected ? "t" : "f") << "\n"


@@ -42,6 +47,8 @@ std::cout << Indent(level, true) << "login: " << info.login << "\n"
           << Indent(level)       << "address: " << info.address << "\n"
           << Indent(level)       << "phone: " << info.phone << "\n"
           << Indent(level)       << "free mb: " << info.stat.freeMb << "\n"
           << Indent(level)       << "address: " << info.address << "\n"
           << Indent(level)       << "phone: " << info.phone << "\n"
           << Indent(level)       << "free mb: " << info.stat.freeMb << "\n"

+          << Indent(level)       << "last ping time: " << TimeToString(info.pingTime) << "\n"
+          << Indent(level)       << "last activity time: " << TimeToString(info.lastActivityTime) << "\n"

           << Indent(level)       << "traffic:\n";
 for (size_t i = 0; i < DIR_NUM; ++i)
     {
           << Indent(level)       << "traffic:\n";
 for (size_t i = 0; i < DIR_NUM; ++i)
     {


@@ -54,6 +61,12 @@ for (size_t i = 0; i < DIR_NUM; ++i)
 std::cout << Indent(level)       << "user data:\n";
 for (size_t i = 0; i < USERDATA_NUM; ++i)
     std::cout << Indent(level + 1, true) << "user data " << i << ": " << info.userData[i] << "\n";
 std::cout << Indent(level)       << "user data:\n";
 for (size_t i = 0; i < USERDATA_NUM; ++i)
     std::cout << Indent(level + 1, true) << "user data " << i << ": " << info.userData[i] << "\n";

+if (!info.authBy.empty())
+    {
+    std::cout << Indent(level) << "auth by:\n";
+    for (size_t i = 0; i < info.authBy.size(); ++i)
+        std::cout << Indent(level + 1, true) << info.authBy[i] << "\n";
+    }

 }
 
 void SimpleCallback(bool result,
 }
 
 void SimpleCallback(bool result,


@@ -96,11 +109,9 @@ if (!result)
 PrintUser(info);
 }
 
 PrintUser(info);
 }
 

-} // namespace anonymous
-
-bool SGCONF::GetUsersFunction(const SGCONF::CONFIG & config,
-                                const std::string & /*arg*/,
-                                const std::map<std::string, std::string> & /*options*/)
+bool GetUsersFunction(const SGCONF::CONFIG & config,
+                      const std::string & /*arg*/,
+                      const std::map<std::string, std::string> & /*options*/)

 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),


@@ -109,9 +120,9 @@ STG::SERVCONF proto(config.server.data(),
 return proto.GetUsers(GetUsersCallback, NULL) == STG::st_ok;
 }
 
 return proto.GetUsers(GetUsersCallback, NULL) == STG::st_ok;
 }
 

-bool SGCONF::GetUserFunction(const SGCONF::CONFIG & config,
-                               const std::string & arg,
-                               const std::map<std::string, std::string> & /*options*/)
+bool GetUserFunction(const SGCONF::CONFIG & config,
+                     const std::string & arg,
+                     const std::map<std::string, std::string> & /*options*/)

 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),


@@ -120,9 +131,9 @@ STG::SERVCONF proto(config.server.data(),
 return proto.GetUser(arg, GetUserCallback, NULL) == STG::st_ok;
 }
 
 return proto.GetUser(arg, GetUserCallback, NULL) == STG::st_ok;
 }
 

-bool SGCONF::DelUserFunction(const SGCONF::CONFIG & config,
-                               const std::string & arg,
-                               const std::map<std::string, std::string> & /*options*/)
+bool DelUserFunction(const SGCONF::CONFIG & config,
+                     const std::string & arg,
+                     const std::map<std::string, std::string> & /*options*/)

 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),


@@ -131,20 +142,52 @@ STG::SERVCONF proto(config.server.data(),
 return proto.DelUser(arg, SimpleCallback, NULL) == STG::st_ok;
 }
 
 return proto.DelUser(arg, SimpleCallback, NULL) == STG::st_ok;
 }
 

-bool SGCONF::AddUserFunction(const SGCONF::CONFIG & config,
-                               const std::string & arg,
-                               const std::map<std::string, std::string> & /*options*/)
+bool AddUserFunction(const SGCONF::CONFIG & config,
+                     const std::string & arg,
+                     const std::map<std::string, std::string> & /*options*/)

 {
 // TODO
 std::cerr << "Unimplemented.\n";
 return false;
 }
 
 {
 // TODO
 std::cerr << "Unimplemented.\n";
 return false;
 }
 

-bool SGCONF::ChgUserFunction(const SGCONF::CONFIG & config,
-                               const std::string & arg,
-                               const std::map<std::string, std::string> & options)
+bool ChgUserFunction(const SGCONF::CONFIG & config,
+                     const std::string & arg,
+                     const std::map<std::string, std::string> & options)

 {
 // TODO
 std::cerr << "Unimplemented.\n";
 return false;
 }
 {
 // TODO
 std::cerr << "Unimplemented.\n";
 return false;
 }

+
+bool CheckUserFunction(const SGCONF::CONFIG & config,
+                       const std::string & arg,
+                       const std::map<std::string, std::string> & options)
+{
+// TODO
+std::cerr << "Unimplemented.\n";
+return false;
+}
+
+bool SendMessageFunction(const SGCONF::CONFIG & config,
+                         const std::string & arg,
+                         const std::map<std::string, std::string> & options)
+{
+// TODO
+std::cerr << "Unimplemented.\n";
+return false;
+}
+
+} // namespace anonymous
+
+void SGCONF::AppendUsersOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks)
+{
+blocks.Add("User management options")
+      .Add("get-users", SGCONF::MakeAPIAction(commands, GetUsersFunction), "\tget user list")
+      .Add("get-user", SGCONF::MakeAPIAction(commands, "<login>", GetUserFunction), "get user")
+      .Add("add-user", SGCONF::MakeAPIAction(commands, "<login>", AddUserFunction), "add user")
+      .Add("del-user", SGCONF::MakeAPIAction(commands, "<login>", DelUserFunction), "del user")
+      .Add("chg-user", SGCONF::MakeAPIAction(commands, "<login>", ChgUserFunction), "change user")
+      .Add("check-user", SGCONF::MakeAPIAction(commands, "<login>", CheckUserFunction), "check user existance and credentials")
+      .Add("send-message", SGCONF::MakeAPIAction(commands, "<login>", SendMessageFunction), "send message");
+}