Revert "Merge remote-tracking branch 'origin/master' into ticket37"

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

diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h
index a16b392984454fe0679baad959f7457492068331..5987c4d8c6b9d51c93c980877b8b59da0558e7ed 100644 (file)
--- a/include/stg/user_conf.h
+++ b/include/stg/user_conf.h
@@ -39,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> services;
+    std::vector<std::string> service;

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


@@ -67,12 +67,13 @@ 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 (size_t i = 0; i < USERDATA_NUM; i++) userdata[i]  = uc.userdata[i];
-        services     = uc.services;
+        for (int i = 0; i < USERDATA_NUM; i++)
+            {
+            userdata[i]  = uc.userdata[i];
+            }

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


@@ -91,15 +92,13 @@ 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 (size_t i = 0; i < USERDATA_NUM; i++)
+        for (int 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;


@@ -117,12 +116,10 @@ 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;
 };