Ticket. GetChangePolicyTimeout() function removed.

[stg.git] / include / stg / user_conf.h

diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h
index 70cb4fa7f5f2fd0d76e01f9abb02ef1b78dd0f55..a16b392984454fe0679baad959f7457492068331 100644 (file)
--- a/include/stg/user_conf.h
+++ b/include/stg/user_conf.h
@@ -18,26 +18,14 @@
 struct USER_CONF
 {
     USER_CONF()
 struct USER_CONF
 {
     USER_CONF()

-        : password(),
-          passive(0),
+        : passive(0),

           disabled(0),
           disabledDetailStat(0),
           alwaysOnline(0),
           disabled(0),
           disabledDetailStat(0),
           alwaysOnline(0),

-          tariffName(),
-          address(),
-          phone(),
-          email(),
-          note(),
-          realName(),
-          corp(),
-          service(),
-          group(),

           credit(0),
           credit(0),

-          nextTariff(),

           userdata(USERDATA_NUM),
           userdata(USERDATA_NUM),

-          creditExpire(0),
-          ips()
-    {};
+          creditExpire(0)
+    {}

 
     std::string              password;
     int                      passive;
 
     std::string              password;
     int                      passive;


@@ -51,7 +39,7 @@ struct USER_CONF
     std::string              note;
     std::string              realName;
     std::string              corp;
     std::string              note;
     std::string              realName;
     std::string              corp;

-    std::vector<std::string> service;
+    std::vector<std::string> services;

     std::string              group;
     double                   credit;
     std::string              nextTariff;
     std::string              group;
     double                   credit;
     std::string              nextTariff;


@@ -63,26 +51,8 @@ struct USER_CONF
 struct USER_CONF_RES
 {
     USER_CONF_RES()
 struct USER_CONF_RES
 {
     USER_CONF_RES()

-        : password(),
-          passive(),
-          disabled(),
-          disabledDetailStat(),
-          alwaysOnline(),
-          tariffName(),
-          address(),
-          phone(),
-          email(),
-          note(),
-          realName(),
-          group(),
-          credit(),
-          nextTariff(),
-          userdata(USERDATA_NUM, RESETABLE<std::string>()),
-          creditExpire(),
-          ips()
-    {
-    };
-
+        : userdata(USERDATA_NUM)
+    {}

     USER_CONF_RES & operator=(const USER_CONF & uc)
     {
         userdata.resize(USERDATA_NUM);
     USER_CONF_RES & operator=(const USER_CONF & uc)
     {
         userdata.resize(USERDATA_NUM);


@@ -97,40 +67,41 @@ struct USER_CONF_RES
         email        = uc.email;
         note         = uc.note;
         realName     = uc.realName;
         email        = uc.email;
         note         = uc.note;
         realName     = uc.realName;

+        corp         = uc.corp;

         group        = uc.group;
         credit       = uc.credit;
         nextTariff   = uc.nextTariff;
         group        = uc.group;
         credit       = uc.credit;
         nextTariff   = uc.nextTariff;

-        for (int i = 0; i < USERDATA_NUM; i++)
-            {
-            userdata[i]  = uc.userdata[i];
-            }
+        for (size_t i = 0; i < USERDATA_NUM; i++) userdata[i]  = uc.userdata[i];
+        services     = uc.services;

         creditExpire = uc.creditExpire;
         ips          = uc.ips;
         return *this;
         creditExpire = uc.creditExpire;
         ips          = uc.ips;
         return *this;

-    };
-    operator USER_CONF() const
+    }
+    USER_CONF GetData() const

     {
         USER_CONF uc;
     {
         USER_CONF uc;

-        uc.password     = password;
-        uc.passive      = passive;
-        uc.disabled     = disabled;
-        uc.disabledDetailStat = disabledDetailStat;
-        uc.alwaysOnline = alwaysOnline;
-        uc.tariffName   = tariffName;
-        uc.address      = address;
-        uc.phone        = phone;
-        uc.email        = email;
-        uc.note         = note;
-        uc.realName     = realName;
-        uc.group        = group;
-        uc.credit       = credit;
-        uc.nextTariff   = nextTariff;
-        for (int i = 0; i < USERDATA_NUM; i++)
+        uc.password     = password.data();
+        uc.passive      = passive.data();
+        uc.disabled     = disabled.data();
+        uc.disabledDetailStat = disabledDetailStat.data();
+        uc.alwaysOnline = alwaysOnline.data();
+        uc.tariffName   = tariffName.data();
+        uc.address      = address.data();
+        uc.phone        = phone.data();
+        uc.email        = email.data();
+        uc.note         = note.data();
+        uc.realName     = realName.data();
+        uc.corp         = corp.data();
+        uc.group        = group.data();
+        uc.credit       = credit.data();
+        uc.nextTariff   = nextTariff.data();
+        for (size_t i = 0; i < USERDATA_NUM; i++)

             {
             {

-            uc.userdata[i]  = userdata[i];
+            uc.userdata[i]  = userdata[i].data();

             }
             }

-        uc.creditExpire = creditExpire;
-        uc.ips          = ips;
+        uc.services     = services.data();
+        uc.creditExpire = creditExpire.data();
+        uc.ips          = ips.data();

         return uc;
     }
     //-------------------------------------------------------------------------
         return uc;
     }
     //-------------------------------------------------------------------------


@@ -146,13 +117,14 @@ struct USER_CONF_RES
     RESETABLE<std::string>               email;
     RESETABLE<std::string>               note;
     RESETABLE<std::string>               realName;
     RESETABLE<std::string>               email;
     RESETABLE<std::string>               note;
     RESETABLE<std::string>               realName;

+    RESETABLE<std::string>               corp;

     RESETABLE<std::string>               group;
     RESETABLE<double>                    credit;
     RESETABLE<std::string>               nextTariff;
     std::vector<RESETABLE<std::string> > userdata;
     RESETABLE<std::string>               group;
     RESETABLE<double>                    credit;
     RESETABLE<std::string>               nextTariff;
     std::vector<RESETABLE<std::string> > userdata;

+    RESETABLE<std::vector<std::string> > services;

     RESETABLE<time_t>                    creditExpire;
     RESETABLE<USER_IPS>                  ips;
 };
 //-----------------------------------------------------------------------------
 #endif
     RESETABLE<time_t>                    creditExpire;
     RESETABLE<USER_IPS>                  ips;
 };
 //-----------------------------------------------------------------------------
 #endif

-