Pass config file via const reference in sgauth/sgathstress settings

[stg.git] / projects / stargazer / user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 4cb4467ee70c7c70abfe370ec15a8cae5c81af79..8c61523a835fb5ae25c45f0b23d29b421c5a4109 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -46,6 +46,7 @@
 #include "stg/admin.h"
 #include "user_impl.h"
 #include "settings_impl.h"
+#include "stg_timer.h"
 
 #ifdef USE_ABSTRACT_SETTINGS
 USER_IMPL::USER_IMPL(const SETTINGS * s,
@@ -53,7 +54,8 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
            const TARIFFS * t,
            const ADMIN * a,
            const USERS * u)
-    : users(u),
+    : USER(),
+      users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       login(),
@@ -136,7 +138,8 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
            const TARIFFS * t,
            const ADMIN * a,
            const USERS * u)
-    : users(u),
+    : USER(),
+      users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       login(),
@@ -216,7 +219,8 @@ pthread_mutex_init(&mutex, &attr);
 #endif
 //-----------------------------------------------------------------------------
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
-    : users(u.users),
+    : USER(),
+      users(u.users),
       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       login(u.login),
@@ -562,7 +566,7 @@ if (!fakeConnect)
                 id,
                 dirsStr);
 
-        ScriptExec(scriptOnConnectParams);
+        ScriptExec(scriptOnConnectParams.c_str());
         }
     else
         {
@@ -619,7 +623,7 @@ if (!fakeDisconnect)
                 id,
                 dirsStr);
 
-        ScriptExec(scriptOnDisonnectParams);
+        ScriptExec(scriptOnDisonnectParams.c_str());
         }
     else
         {
@@ -1028,7 +1032,7 @@ if (access(scriptOnAdd.c_str(), X_OK) == 0)
             scriptOnAdd.c_str(),
             login.c_str());
 
-    ScriptExec(scriptOnAddParams);
+    ScriptExec(scriptOnAddParams.c_str());
     }
 else
     {
@@ -1050,7 +1054,7 @@ if (access(scriptOnDel.c_str(), X_OK) == 0)
             scriptOnDel.c_str(),
             login.c_str());
 
-    ScriptExec(scriptOnDelParams);
+    ScriptExec(scriptOnDelParams.c_str());
     }
 else
     {
@@ -1423,10 +1427,12 @@ if (newPassive && !oldPassive && user->tariff != NULL)
 void CHG_TARIFF_NOTIFIER::Notify(const string &, const string & newTariff)
 {
 if (user->settings->GetReconnectOnTariffChange() && user->connected)
-    user->Disconnect(true, "Change tariff");
+    user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
-if (user->settings->GetReconnectOnTariffChange() && user->IsInetable())
-    user->Connect(true);
+if (user->settings->GetReconnectOnTariffChange() &&
+    !user->authorizedBy.empty() &&
+    user->IsInetable())
+    user->Connect(false);
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)
@@ -1439,8 +1445,8 @@ void CHG_IPS_NOTIFIER::Notify(const USER_IPS & from, const USER_IPS & to)
 {
     printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str());
     if (user->connected)
-        user->Disconnect(true, "Change IP");
-    if (user->IsInetable())
-        user->Connect(true);
+        user->Disconnect(false, "Change IP");
+    if (!user->authorizedBy.empty() && user->IsInetable())
+        user->Connect(false);
 }
 //-----------------------------------------------------------------------------