#include <ctime>
#include <list>
#include <string>
-#include <map>
#include <set>
-#include "user.h"
-#include "os_int.h"
-#include "stg_const.h"
-#include "user_stat.h"
-#include "user_conf.h"
-#include "user_ips.h"
-#include "user_property.h"
-#include "base_auth.h"
-#include "stg_message.h"
-#include "noncopyable.h"
-
-using namespace std;
+#include "stg/user.h"
+#include "stg/os_int.h"
+#include "stg/const.h"
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/user_ips.h"
+#include "stg/user_property.h"
+#include "stg/auth.h"
+#include "stg/message.h"
+#include "stg/noncopyable.h"
//-----------------------------------------------------------------------------
class TARIFF;
class TARIFFS;
class ADMIN;
class USER_IMPL;
+class SETTINGS_IMPL;
//-----------------------------------------------------------------------------
class USER_ID_GENERATOR {
friend class USER_IMPL;
USER_IMPL * user;
};
//-----------------------------------------------------------------------------
-class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<string>,
+class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string>,
private NONCOPYABLE {
public:
CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}
- void Notify(const string & oldTariff, const string & newTariff);
+ void Notify(const std::string & oldTariff, const std::string & newTariff);
private:
USER_IMPL * user;
friend class CHG_CASH_NOTIFIER;
friend class CHG_IP_NOTIFIER;
public:
- USER_IMPL(const SETTINGS * settings,
- const BASE_STORE * store,
+ USER_IMPL(const SETTINGS_IMPL * settings,
+ const STORE * store,
const TARIFFS * tariffs,
- const ADMIN & sysAdmin,
+ const ADMIN * sysAdmin,
const USERS * u);
USER_IMPL(const USER_IMPL & u);
virtual ~USER_IMPL();
int WriteStat();
int WriteMonthStat();
- string const & GetLogin() const { return login; }
- void SetLogin(string const & l);
+ const std::string & GetLogin() const { return login; }
+ void SetLogin(std::string const & l);
uint32_t GetCurrIP() const { return currIP; }
time_t GetCurrIPModificationTime() const { return currIP.ModificationTime(); }
void AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
void DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+ void AddConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+ void DelConnectedBeforeNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+
+ void AddConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+ void DelConnectedAfterNotifier(PROPERTY_NOTIFIER_BASE<bool> *);
+
int GetID() const { return id; }
double GetPassiveTimePart() const;
bool GetConnected() const { return connected; }
time_t GetConnectedModificationTime() const { return connected.ModificationTime(); }
int GetAuthorized() const { return authorizedBy.size(); }
- int Authorize(uint32_t ip, const string & iface, uint32_t enabledDirs, const BASE_AUTH * auth);
- void Unauthorize(const BASE_AUTH * auth);
- bool IsAuthorizedBy(const BASE_AUTH * auth) const;
+ int Authorize(uint32_t ip, uint32_t enabledDirs, const AUTH * auth);
+ void Unauthorize(const AUTH * auth);
+ bool IsAuthorizedBy(const AUTH * auth) const;
int AddMessage(STG_MSG * msg);
void PrintUser() const;
void Run();
- const string & GetStrError() const { return errorStr; }
+ const std::string & GetStrError() const { return errorStr; }
USER_PROPERTIES & GetProperty() { return property; };
const USER_PROPERTIES & GetProperty() const { return property; };
void ProcessNewMonth();
bool IsInetable();
- string GetEnabledDirs();
+ std::string GetEnabledDirs();
void OnAdd();
void OnDelete();
time_t lastScanMessages;
- string login;
+ std::string login;
int id;
bool __connected;
USER_PROPERTY<bool> connected;
USER_ID_GENERATOR userIDGenerator;
- uint32_t __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
+ uint32_t __currIP; // Current user's ip
USER_PROPERTY<uint32_t> currIP;
- /*
- ë ÔÏÍÕ ÍÏÍÅÎÔÕ ËÁË ÍÙ ÕÖÅ ÎÅ Á×ÔÏÒÉÚÏ×ÁÎÉÙ, ÎÏ ÅÝÅ ÎÅ ×ÙÐÏÌÎÅÎ Disconnect,
- currIP ÕÖÅ ÓÂÒÏÛÅÎ. ðÏÓÌÅÄÎÅÅ ÚÎÁÞÅÎÉÅ currIP ÓÏÈÒÁÎÑÅÍ × lastIPForDisconnect
- */
- uint32_t lastIPForDisconnect;
+ uint32_t lastIPForDisconnect; // User's ip after unauth but before disconnect
time_t pingTime;
- const ADMIN & sysAdmin;
- const BASE_STORE * store;
+ const ADMIN * sysAdmin;
+ const STORE * store;
const TARIFFS * tariffs;
const TARIFF * tariff;
TRAFF_STAT traffStat;
std::pair<time_t, TRAFF_STAT> traffStatSaved;
- const SETTINGS * settings;
+ const SETTINGS_IMPL * settings;
- set<const BASE_AUTH *> authorizedBy;
+ std::set<const AUTH *> authorizedBy;
- list<STG_MSG> messages;
+ std::list<STG_MSG> messages;
bool deleted;
- time_t lastWriteStat; // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
- time_t lastWriteDeatiledStat; // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
+ time_t lastWriteStat;
+ time_t lastWriteDetailedStat;
// Properties
USER_PROPERTY<double> & cash;
USER_PROPERTY<time_t> & lastCashAddTime;
USER_PROPERTY<double> & freeMb;
USER_PROPERTY<time_t> & lastActivityTime;
- USER_PROPERTY<string> & password;
+ USER_PROPERTY<std::string> & password;
USER_PROPERTY<int> & passive;
USER_PROPERTY<int> & disabled;
USER_PROPERTY<int> & disabledDetailStat;
USER_PROPERTY<int> & alwaysOnline;
- USER_PROPERTY<string> & tariffName;
- USER_PROPERTY<string> & nextTariff;
- USER_PROPERTY<string> & address;
- USER_PROPERTY<string> & note;
- USER_PROPERTY<string> & group;
- USER_PROPERTY<string> & email;
- USER_PROPERTY<string> & phone;
- USER_PROPERTY<string> & realName;
+ USER_PROPERTY<std::string> & tariffName;
+ USER_PROPERTY<std::string> & nextTariff;
+ USER_PROPERTY<std::string> & address;
+ USER_PROPERTY<std::string> & note;
+ USER_PROPERTY<std::string> & group;
+ USER_PROPERTY<std::string> & email;
+ USER_PROPERTY<std::string> & phone;
+ USER_PROPERTY<std::string> & realName;
USER_PROPERTY<double> & credit;
USER_PROPERTY<time_t> & creditExpire;
USER_PROPERTY<USER_IPS> & ips;
- USER_PROPERTY<string> & userdata0;
- USER_PROPERTY<string> & userdata1;
- USER_PROPERTY<string> & userdata2;
- USER_PROPERTY<string> & userdata3;
- USER_PROPERTY<string> & userdata4;
- USER_PROPERTY<string> & userdata5;
- USER_PROPERTY<string> & userdata6;
- USER_PROPERTY<string> & userdata7;
- USER_PROPERTY<string> & userdata8;
- USER_PROPERTY<string> & userdata9;
+ USER_PROPERTY<std::string> & userdata0;
+ USER_PROPERTY<std::string> & userdata1;
+ USER_PROPERTY<std::string> & userdata2;
+ USER_PROPERTY<std::string> & userdata3;
+ USER_PROPERTY<std::string> & userdata4;
+ USER_PROPERTY<std::string> & userdata5;
+ USER_PROPERTY<std::string> & userdata6;
+ USER_PROPERTY<std::string> & userdata7;
+ USER_PROPERTY<std::string> & userdata8;
+ USER_PROPERTY<std::string> & userdata9;
// End properties
mutable pthread_mutex_t mutex;
- string errorStr;
+ std::string errorStr;
};
//-----------------------------------------------------------------------------
+typedef USER_IMPL * USER_IMPL_PTR;
+
#endif //USER_H
git.stg.codes / stg.git / blobdiff