Merge pull request #2 from bobr-kun/MySQL_custom_port

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index 5a738d16d2b81220503c18177d63547b191a874e..3242240f769fe4c75664942cd727d5396fec6477 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -88,7 +88,7 @@ if (users->FindByName(login, &u))
     *retvalPtr = xmlrpc_c::value_boolean(true);
     return;
     }
     *retvalPtr = xmlrpc_c::value_boolean(true);
     return;
     }

-    
+

 *retvalPtr = xmlrpc_c::value_boolean(false);
 return;
 }
 *retvalPtr = xmlrpc_c::value_boolean(false);
 return;
 }


@@ -385,7 +385,7 @@ if (tariffs->FindByName(tariff))
         if (newTariff)
             {
             const TARIFF * currentTariff = u->GetTariff();
         if (newTariff)
             {
             const TARIFF * currentTariff = u->GetTariff();

-            std::string message = currentTariff->TariffChangeIsAllowed(*newTariff);
+            std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, stgTime);

             if (message.empty())
                 {
                 if (u->GetProperty().tariffName.Set(tariff,
             if (message.empty())
                 {
                 if (u->GetProperty().tariffName.Set(tariff,