Use unicode for messages. Convert before sending.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index 8e11a157ccd4a86addebffd3da8f0b49ebfa5ed8..5499c3825eb9e1e1d96a34bda60cfa1d13317c4c 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -286,6 +286,13 @@ answerList->push_back(s);
 strprintf(&s, "<CreditExpire value=\"%ld\" />", u->GetProperty().creditExpire.Get());
 answerList->push_back(s);
 
 strprintf(&s, "<CreditExpire value=\"%ld\" />", u->GetProperty().creditExpire.Get());
 answerList->push_back(s);
 

+s = "<AuthorizedBy>";
+std::vector<std::string> list(u->GetAuthorizers());
+for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+    s += "<Auth name=\"" + *it + "\">";
+s += "</AuthorizedBy>";
+answerList->push_back(s);
+

 strprintf(&s, "</user>");
 answerList->push_back(s);
 }
 strprintf(&s, "</user>");
 answerList->push_back(s);
 }


@@ -914,13 +921,12 @@ else
     if (strcasecmp(el, "traff") == 0)
         {
         int j = 0;
     if (strcasecmp(el, "traff") == 0)
         {
         int j = 0;

-        int dir;

         DIR_TRAFF dtu;
         DIR_TRAFF dtd;
         uint64_t t = 0;
         while (attr[j])
             {
         DIR_TRAFF dtu;
         DIR_TRAFF dtd;
         uint64_t t = 0;
         while (attr[j])
             {

-            dir = attr[j][2] - '0';
+            int dir = attr[j][2] - '0';

 
             if (strncasecmp(attr[j], "md", 2) == 0)
                 {
 
             if (strncasecmp(attr[j], "md", 2) == 0)
                 {


@@ -936,8 +942,6 @@ else
                 }
             j+=2;
             }
                 }
             j+=2;
             }

-        usr->down = dtd;
-        usr->up = dtu;

         return 0;
         }
 
         return 0;
         }
 


@@ -1009,13 +1013,13 @@ if (users->FindByName(login, &u))
 
 bool check = false;
 bool alwaysOnline = u->GetProperty().alwaysOnline;
 
 bool check = false;
 bool alwaysOnline = u->GetProperty().alwaysOnline;

-if (!ucr->alwaysOnline.res_empty())
+if (!ucr->alwaysOnline.empty())

     {
     check = true;
     alwaysOnline = ucr->alwaysOnline.const_data();
     }
 bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();
     {
     check = true;
     alwaysOnline = ucr->alwaysOnline.const_data();
     }
 bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();

-if (!ucr->ips.res_empty())
+if (!ucr->ips.empty())

     {
     check = true;
     onlyOneIP = ucr->ips.const_data().OnlyOneIP();
     {
     check = true;
     onlyOneIP = ucr->ips.const_data().OnlyOneIP();


@@ -1042,49 +1046,49 @@ for (size_t i = 0; i < ucr->ips.const_data().Count(); ++i)
         }
     }
 
         }
     }
 

-if (!ucr->ips.res_empty())
+if (!ucr->ips.empty())

     if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->alwaysOnline.res_empty())
+if (!ucr->alwaysOnline.empty())

     if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(),
                                       currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(),
                                       currAdmin, login, store))
         res = -1;
 

-if (!ucr->address.res_empty())
+if (!ucr->address.empty())

     if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->creditExpire.res_empty())
+if (!ucr->creditExpire.empty())

     if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
                                       currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
                                       currAdmin, login, store))
         res = -1;
 

-if (!ucr->credit.res_empty())
+if (!ucr->credit.empty())

     if (!u->GetProperty().credit.Set(ucr->credit.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().credit.Set(ucr->credit.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!usr->freeMb.res_empty())
+if (!usr->freeMb.empty())

     if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->disabled.res_empty())
+if (!ucr->disabled.empty())

     if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->disabledDetailStat.res_empty())
+if (!ucr->disabledDetailStat.empty())

     if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->email.res_empty())
+if (!ucr->email.empty())

     if (!u->GetProperty().email.Set(ucr->email.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().email.Set(ucr->email.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->group.res_empty())
+if (!ucr->group.empty())

     if (!u->GetProperty().group.Set(ucr->group.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().group.Set(ucr->group.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->note.res_empty())
+if (!ucr->note.empty())

     if (!u->GetProperty().note.Set(ucr->note.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().note.Set(ucr->note.const_data(), currAdmin, login, store))
         res = -1;
 


@@ -1102,31 +1106,31 @@ userdata.push_back(u->GetProperty().userdata9.GetPointer());
 
 for (int i = 0; i < (int)userdata.size(); i++)
     {
 
 for (int i = 0; i < (int)userdata.size(); i++)
     {

-    if (!ucr->userdata[i].res_empty())
+    if (!ucr->userdata[i].empty())

         {
         if(!userdata[i]->Set(ucr->userdata[i].const_data(), currAdmin, login, store))
             res = -1;
         }
     }
 
         {
         if(!userdata[i]->Set(ucr->userdata[i].const_data(), currAdmin, login, store))
             res = -1;
         }
     }
 

-if (!ucr->passive.res_empty())
+if (!ucr->passive.empty())

     if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->password.res_empty())
+if (!ucr->password.empty())

     if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->phone.res_empty())
+if (!ucr->phone.empty())

     if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store))
         res = -1;
 

-if (!ucr->realName.res_empty())
+if (!ucr->realName.empty())

     if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store))
         res = -1;
 
 
     if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store))
         res = -1;
 
 

-if (!usr->cash.res_empty())
+if (!usr->cash.empty())

     {
     //if (*currAdmin->GetPriv()->userCash)
         {
     {
     //if (*currAdmin->GetPriv()->userCash)
         {


@@ -1148,7 +1152,7 @@ if (!usr->cash.res_empty())
     }
 
 
     }
 
 

-if (!ucr->tariffName.res_empty())
+if (!ucr->tariffName.empty())

     {
     if (tariffs->FindByName(ucr->tariffName.const_data()))
         {
     {
     if (tariffs->FindByName(ucr->tariffName.const_data()))
         {


@@ -1163,7 +1167,7 @@ if (!ucr->tariffName.res_empty())
         }
     }
 
         }
     }
 

-if (!ucr->nextTariff.res_empty())
+if (!ucr->nextTariff.empty())

     {
     if (tariffs->FindByName(ucr->nextTariff.const_data()))
         {
     {
     if (tariffs->FindByName(ucr->nextTariff.const_data()))
         {


@@ -1183,14 +1187,14 @@ int upCount = 0;
 int downCount = 0;
 for (int i = 0; i < DIR_NUM; i++)
     {
 int downCount = 0;
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!upr[i].res_empty())
+    if (!upr[i].empty())

         {
         {

-        up[i] = upr[i];
+        up[i] = upr[i].data();

         upCount++;
         }
         upCount++;
         }

-    if (!downr[i].res_empty())
+    if (!downr[i].empty())

         {
         {

-        down[i] = downr[i];
+        down[i] = downr[i].data();

         downCount++;
         }
     }
         downCount++;
         }
     }


@@ -1203,15 +1207,6 @@ if (downCount)
     if (!u->GetProperty().down.Set(down, currAdmin, login, store))
         res = -1;
 
     if (!u->GetProperty().down.Set(down, currAdmin, login, store))
         res = -1;
 

-/*if (!usr->down.res_empty())
-    {
-    u->GetProperty().down.Set(usr->down.const_data(), currAdmin, login, store);
-    }
-if (!usr->up.res_empty())
-    {
-    u->GetProperty().up.Set(usr->up.const_data(), currAdmin, login, store);
-    }*/
-

 u->WriteConf();
 u->WriteStat();
 
 u->WriteConf();
 u->WriteStat();