Clone from local repo.

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

diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h
index dcc19afa0c9e430674e8d83711ecc46f1568ebe9..fe458211b2ef69c8f8e8ca50f63756b95d205e1c 100644 (file)
--- a/include/stg/user_conf.h
+++ b/include/stg/user_conf.h
@@ -30,7 +30,7 @@ struct USER_CONF
           note(),
           realName(),
           corp(),
           note(),
           realName(),
           corp(),

-          service(),
+          services(),

           group(),
           credit(0),
           nextTariff(),
           group(),
           credit(0),
           nextTariff(),


@@ -51,7 +51,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;


@@ -74,10 +74,12 @@ struct USER_CONF_RES
           email(),
           note(),
           realName(),
           email(),
           note(),
           realName(),

+          corp(),

           group(),
           credit(),
           nextTariff(),
           group(),
           credit(),
           nextTariff(),

-          userdata(USERDATA_NUM, RESETABLE<std::string>()),
+          userdata(USERDATA_NUM),
+          services(),

           creditExpire(),
           ips()
     {
           creditExpire(),
           ips()
     {


@@ -97,13 +99,12 @@ 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;


@@ -122,13 +123,15 @@ struct USER_CONF_RES
         uc.email        = email.data();
         uc.note         = note.data();
         uc.realName     = realName.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();
         uc.group        = group.data();
         uc.credit       = credit.data();
         uc.nextTariff   = nextTariff.data();

-        for (int i = 0; i < USERDATA_NUM; i++)
+        for (size_t i = 0; i < USERDATA_NUM; i++)

             {
             uc.userdata[i]  = userdata[i].data();
             }
             {
             uc.userdata[i]  = userdata[i].data();
             }

+        uc.services     = services.data();

         uc.creditExpire = creditExpire.data();
         uc.ips          = ips.data();
         return uc;
         uc.creditExpire = creditExpire.data();
         uc.ips          = ips.data();
         return uc;


@@ -146,10 +149,12 @@ 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;
 };
     RESETABLE<time_t>                    creditExpire;
     RESETABLE<USER_IPS>                  ips;
 };