Ticket 37. The time_t currentTime parameter added in

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 70a079bf8fb20608b9e47c1154566a833b4645ad..18d1abaf163dd4758d3113fa068c7d0fd723326a 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -319,6 +319,7 @@ STG_LOCKER lock(&mutex);
 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
+    printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());
     return false;
     }
 
@@ -344,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);
@@ -355,25 +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;
 }
 //-----------------------------------------------------------------------------
@@ -437,15 +425,7 @@ while (us->nonstop)
     stgUsleep(100000);
     } //while (us->nonstop)
 
-user_iter ui = us->users.begin();
-while (ui != us->users.end())
-    {
-    us->DelUserFromIndexes(ui);
-    ++ui;
-    }
-
-std::list<USER_TO_DEL>::iterator iter;
-iter = us->usersToDelete.begin();
+std::list<USER_TO_DEL>::iterator iter(us->usersToDelete.begin());
 while (iter != us->usersToDelete.end())
     {
     iter->delTime -= 2 * userDeleteDelayTime;
@@ -523,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())
     {