Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 9985615f85d06c58c9d3ba766cb668a224964379..18d1abaf163dd4758d3113fa068c7d0fd723326a 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -345,7 +345,6 @@ if (store->GetUsersList(&usersList) < 0)
 
 user_iter ui;
 
-unsigned errors = 0;
 for (unsigned int i = 0; i < usersList.size(); i++)
     {
     USER_IMPL u(settings, store, tariffs, sysAdmin, this, m_services);
@@ -356,26 +355,13 @@ for (unsigned int i = 0; i < usersList.size(); i++)
 
     AddUserIntoIndexes(ui);
 
-    if (settings->GetStopOnError())
-        {
-        if (ui->ReadConf() < 0)
-            return -1;
-
-        if (ui->ReadStat() < 0)
-            return -1;
-        }
-    else
-        {
-        if (ui->ReadConf() < 0)
-            errors++;
+    if (ui->ReadConf() < 0)
+        return -1;
 
-        if (ui->ReadStat() < 0)
-            errors++;
-        }
+    if (ui->ReadStat() < 0)
+        return -1;
     }
 
-if (errors > 0)
-    return -1;
 return 0;
 }
 //-----------------------------------------------------------------------------
@@ -517,7 +503,6 @@ else
     }
 
 std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDailyFee));
-std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessServices));
 
 if (settings->GetDayFeeIsLastDay())
     {