X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/64b687f8ec36a103865044613cb0f42f98aeda3a..6aadaaf234bfd8129e8b4ff7f64c3aef8df54659:/include/stg/user_conf.h?ds=sidebyside diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h index 5d65fcee..fe458211 100644 --- a/include/stg/user_conf.h +++ b/include/stg/user_conf.h @@ -30,7 +30,7 @@ struct USER_CONF note(), realName(), corp(), - service(), + services(), group(), credit(0), nextTariff(), @@ -51,7 +51,7 @@ struct USER_CONF std::string note; std::string realName; std::string corp; - std::vector service; + std::vector services; std::string group; double credit; std::string nextTariff; @@ -74,10 +74,12 @@ struct USER_CONF_RES email(), note(), realName(), + corp(), group(), credit(), nextTariff(), userdata(USERDATA_NUM), + services(), creditExpire(), ips() { @@ -97,10 +99,12 @@ struct USER_CONF_RES email = uc.email; note = uc.note; realName = uc.realName; + corp = uc.corp; 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; creditExpire = uc.creditExpire; ips = uc.ips; return *this; @@ -119,13 +123,15 @@ struct USER_CONF_RES 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 (int i = 0; i < USERDATA_NUM; i++) + for (size_t i = 0; i < USERDATA_NUM; i++) { uc.userdata[i] = userdata[i].data(); } + uc.services = services.data(); uc.creditExpire = creditExpire.data(); uc.ips = ips.data(); return uc; @@ -143,10 +149,12 @@ struct USER_CONF_RES RESETABLE email; RESETABLE note; RESETABLE realName; + RESETABLE corp; RESETABLE group; RESETABLE credit; RESETABLE nextTariff; std::vector > userdata; + RESETABLE > services; RESETABLE creditExpire; RESETABLE ips; };