X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..e337600f4c621ccd847d2e852ee5e2b6a0cd8dd6:/projects/sgconf/common_sg.cpp?ds=inline

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 77d7476f..60ad3c84 100644
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <iconv.h>
 
+#include "stg/common.h"
+#include "sg_error_codes.h"
 #include "common_sg.h"
 #include "version_sg.h"
-#include "common.h"
-#include "sg_error_codes.h"
 
 using namespace std;
 
@@ -81,6 +81,7 @@ HelpParams hp[] =
 {
     {"set tariff",              "get tariff",           "-t",   "<tariff:now|delayed>"},
     {"set credit",              "get credit",           "-r",   "<credit>"},
+    {"set credit expire",       "get credit expire",    "-E",   "<credit_expire_date>"},
     {"set password",            "get password",         "-o",   "<new_password>"},
     {"set prepaid traffic",     "get prepaid traffic",  "-e",   "<prepaid>"},
     {"set IP-addresses",	"get IP-addresses",	"-I",	"<*|ip_addr[,ip_addr...]>"},
@@ -218,12 +219,12 @@ char charsetT[100];
 if (encType == TO_KOI8)
     {
     strcpy(charsetF, nl_langinfo(CODESET));
-    strcpy(charsetT, "koi8-r");
+    strcpy(charsetT, "koi8-ru");
     }
 else
     {
     strcpy(charsetT, nl_langinfo(CODESET));
-    strcpy(charsetF, "koi8-r");
+    strcpy(charsetF, "koi8-ru");
     }
 
 size_t nconv = 1;
@@ -330,6 +331,26 @@ if (!req->cash.res_empty())
 if (!req->credit.res_empty())
     cout << "credit=" << ud->credit << endl;
 
+if (!req->creditExpire.res_empty())
+    {
+    char buf[32];
+    struct tm brokenTime;
+    time_t tt = ud->creditExpire;
+
+    brokenTime.tm_wday = 0;
+    brokenTime.tm_yday = 0;
+    brokenTime.tm_isdst = 0;
+    brokenTime.tm_hour = 0;
+    brokenTime.tm_min = 0;
+    brokenTime.tm_sec = 0;
+
+    gmtime_r(&tt, &brokenTime);
+
+    strftime(buf, 32, "%Y-%m-%d", &brokenTime);
+
+    cout << "creditExpire=" << buf << endl;
+    }
+
 if (!req->down.res_empty())
     cout << "down=" << ud->down << endl;
 
@@ -475,5 +496,3 @@ else
 return 0;
 }
 //-----------------------------------------------------------------------------
-
-