Use unicode for messages. Convert before sending.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
index a87c1dbfd765127462866f908b2bb62f724babdf..d93b3448f013efa4d8d6223afa39b6e02c182f95 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
@@ -37,7 +37,7 @@ if (!priv->adminChg)
     return;
     }
 
     return;
     }
 

-string s;
+std::string s;

 //answerList->clear();
 answerList->erase(answerList->begin(), answerList->end());
 
 //answerList->clear();
 answerList->erase(answerList->begin(), answerList->end());
 


@@ -45,17 +45,16 @@ answerList->push_back("<Admins>");
 ADMIN_CONF ac;
 int h = admins->OpenSearch();
 
 ADMIN_CONF ac;
 int h = admins->OpenSearch();
 

-unsigned int p;

 while (admins->SearchNext(h, &ac) == 0)
     {
     //memcpy(&p, &ac.priv, sizeof(unsigned int));
 while (admins->SearchNext(h, &ac) == 0)
     {
     //memcpy(&p, &ac.priv, sizeof(unsigned int));

-    p = (ac.priv.userStat << 0) +
-        (ac.priv.userConf << 2) +
-        (ac.priv.userCash << 4) +
-        (ac.priv.userPasswd << 6) +
-        (ac.priv.userAddDel << 8) +
-        (ac.priv.adminChg << 10) +
-        (ac.priv.tariffChg << 12);
+    unsigned int p = (ac.priv.userStat << 0) +
+                     (ac.priv.userConf << 2) +
+                     (ac.priv.userCash << 4) +
+                     (ac.priv.userPasswd << 6) +
+                     (ac.priv.userAddDel << 8) +
+                     (ac.priv.adminChg << 10) +
+                     (ac.priv.tariffChg << 12);

     strprintf(&s, "<admin login=\"%s\" priv=\"%d\"/>", ac.login.c_str(), p);
     answerList->push_back(s);
     }
     strprintf(&s, "<admin login=\"%s\" priv=\"%d\"/>", ac.login.c_str(), p);
     answerList->push_back(s);
     }


@@ -99,26 +98,12 @@ if (admins->Del(adminToDel, currAdmin) == 0)
     }
 else
     {
     }
 else
     {

-    string s;
+    std::string s;

     strprintf(&s, "<DelAdmin Result=\"Error. %s\"/>", admins->GetStrError().c_str());
     answerList->push_back(s);
     }
 }
 //-----------------------------------------------------------------------------
     strprintf(&s, "<DelAdmin Result=\"Error. %s\"/>", admins->GetStrError().c_str());
     answerList->push_back(s);
     }
 }
 //-----------------------------------------------------------------------------

-int PARSER_DEL_ADMIN::CheckAttr(const char **attr)
-{
-/*  <DelAdmin login=\"admin\">
- *  attr[0] = "login" (word login)
- *  attr[1] = login, value of login
- *  attr[2] = NULL                  */
-
-if (strcasecmp(attr[0], "login") == 0 && attr[1] && !attr[2])
-    {
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------

 //  ADD ADMIN
 //-----------------------------------------------------------------------------
 int PARSER_ADD_ADMIN::ParseStart(void *, const char *el, const char **attr)
 //  ADD ADMIN
 //-----------------------------------------------------------------------------
 int PARSER_ADD_ADMIN::ParseStart(void *, const char *el, const char **attr)


@@ -155,7 +140,7 @@ if (admins->Add(adminToAdd, currAdmin) == 0)
     }
 else
     {
     }
 else
     {

-    string s;
+    std::string s;

     strprintf(&s, "<AddAdmin Result=\"Error. %s\"/>", admins->GetStrError().c_str());
     answerList->push_back(s);
     }
     strprintf(&s, "<AddAdmin Result=\"Error. %s\"/>", admins->GetStrError().c_str());
     answerList->push_back(s);
     }


@@ -212,49 +197,44 @@ void PARSER_CHG_ADMIN::CreateAnswer()
 {
 answerList->erase(answerList->begin(), answerList->end());
 
 {
 answerList->erase(answerList->begin(), answerList->end());
 

-ADMIN_CONF conf;
-conf.login = login;
-if (!login.res_empty())
+
+if (!login.empty())

     {
     {

-    string s;
-    //if (admins->FindAdmin(login.data()) != NULL)
-    //    {
-        if (!password.res_empty())
-            conf.password = password.data();
+    ADMIN * origAdmin = NULL;

 
 

-        if (!privAsString.res_empty())
-            {
-            int p = 0;
-            if (str2x(privAsString.data().c_str(), p) < 0)
-                {
-                strprintf(&s, "<ChgAdmin Result = \"Incorrect parameter Priv.\"/>" );
-                answerList->push_back(s);
-                return;
-                }
-            //memcpy(&conf.priv, &p, sizeof(conf.priv));
-            conf.priv.userStat      = (p & 0x0003) >> 0x00; // 1+2
-            conf.priv.userConf      = (p & 0x000C) >> 0x02; // 4+8
-            conf.priv.userCash      = (p & 0x0030) >> 0x04; // 10+20
-            conf.priv.userPasswd    = (p & 0x00C0) >> 0x06; // 40+80
-            conf.priv.userAddDel    = (p & 0x0300) >> 0x08; // 100+200
-            conf.priv.adminChg      = (p & 0x0C00) >> 0x0A; // 400+800
-            conf.priv.tariffChg     = (p & 0x3000) >> 0x0C; // 1000+2000
-            }
+    if (admins->Find(login.data(), &origAdmin))
+        {
+        answerList->push_back(std::string("<ChgAdmin Result = \"Admin '") + login.data() + "' is not found.\"/>");
+        return;
+        }

 
 

-        if (admins->Change(conf, currAdmin) != 0)
-            {
-            strprintf(&s, "<ChgAdmin Result = \"%s\"/>", admins->GetStrError().c_str());
-            answerList->push_back(s);
-            }
-        else
+    ADMIN_CONF conf(origAdmin->GetConf());
+
+    if (!password.empty())
+        conf.password = password.data();
+
+    if (!privAsString.empty())
+        {
+        int p = 0;
+        if (str2x(privAsString.data().c_str(), p) < 0)

             {
             {

-            answerList->push_back("<ChgAdmin Result = \"Ok\"/>");
+            answerList->push_back("<ChgAdmin Result = \"Incorrect parameter Priv.\"/>");
+            return;

             }
             }

-        return;
-    //    }
-    //strprintf(&s, "<ChgAdmin Result = \"%s\"/>", admins->GetStrError().c_str());
-    //answerList->push_back(s);
-    //return;
+
+        conf.priv.FromInt(p);
+        }
+
+    if (admins->Change(conf, currAdmin) != 0)
+        {
+        std::string s;
+        strprintf(&s, "<ChgAdmin Result = \"%s\"/>", admins->GetStrError().c_str());
+        answerList->push_back(s);
+        }
+    else
+        {
+        answerList->push_back("<ChgAdmin Result = \"Ok\"/>");
+        }

     }
 else
     {
     }
 else
     {