X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4e101b93cafd0881518fc2be53c051d47d374d93..87300676aa712b358ab98beaa5082b7a19e5d97a:/include/stg/user_property.h?ds=sidebyside diff --git a/include/stg/user_property.h b/include/stg/user_property.h index fbcf8856..f024f457 100644 --- a/include/stg/user_property.h +++ b/include/stg/user_property.h @@ -12,12 +12,15 @@ $Author: faust $ #include <ctime> #include <string> #include <set> +#include <map> #include <sstream> #include <iostream> #include "stg/logger.h" #include "stg/locker.h" +#include "stg/settings.h" #include "stg/scriptexecuter.h" +#include "stg/common.h" #include "store.h" #include "admin.h" @@ -31,8 +34,10 @@ public: virtual std::string ToString() const = 0; }; //----------------------------------------------------------------------------- +typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY; +//----------------------------------------------------------------------------- template<typename varT> -class USER_PROPERTY : USER_PROPERTY_BASE { +class USER_PROPERTY : public USER_PROPERTY_BASE { public: USER_PROPERTY(varT & val); virtual ~USER_PROPERTY(); @@ -72,10 +77,12 @@ public: bool isPassword, bool isStat, STG_LOGGER & logger, - const std::string & sd); + const SETTINGS & s, + REGISTRY & properties); virtual ~USER_PROPERTY_LOGGED() {} USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; } + const USER_PROPERTY_LOGGED<varT> * GetPointer() const throw() { return this; } const varT & Get() const { return USER_PROPERTY<varT>::ConstData(); } const std::string & GetName() const { return name; } bool Set(const varT & val, @@ -106,7 +113,7 @@ private: bool isPassword; bool isStat; std::string name; - const std::string scriptsDir; + const SETTINGS& settings; }; //----------------------------------------------------------------------------- class USER_PROPERTIES : private NONCOPYABLE { @@ -122,8 +129,9 @@ private: USER_STAT stat; USER_CONF conf; + REGISTRY properties; public: - USER_PROPERTIES(const std::string & sd); + USER_PROPERTIES(const SETTINGS& s); USER_STAT & Stat() { return stat; } USER_CONF & Conf() { return conf; } @@ -135,6 +143,7 @@ public: void SetProperties(const USER_PROPERTIES & p) { stat = p.stat; conf = p.conf; } std::string GetPropertyValue(const std::string & name) const; + bool Exists(const std::string & name) const; USER_PROPERTY_LOGGED<double> cash; USER_PROPERTY_LOGGED<DIR_TRAFF> up; @@ -171,8 +180,6 @@ public: USER_PROPERTY_LOGGED<std::string> userdata7; USER_PROPERTY_LOGGED<std::string> userdata8; USER_PROPERTY_LOGGED<std::string> userdata9; - - std::map<std::string, USER_PROPERTY_BASE*> params; }; //============================================================================= @@ -209,7 +216,7 @@ template <typename varT> inline void USER_PROPERTY<varT>::Set(const varT & rvalue) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); +STG_LOCKER locker(&mutex); typename std::set<PROPERTY_NOTIFIER_BASE<varT> *>::iterator ni; @@ -239,7 +246,7 @@ template <typename varT> inline void USER_PROPERTY<varT>::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); +STG_LOCKER locker(&mutex); beforeNotifiers.insert(n); } //----------------------------------------------------------------------------- @@ -247,7 +254,7 @@ template <typename varT> inline void USER_PROPERTY<varT>::DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); +STG_LOCKER locker(&mutex); beforeNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n)); } //----------------------------------------------------------------------------- @@ -255,7 +262,7 @@ template <typename varT> inline void USER_PROPERTY<varT>::AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); +STG_LOCKER locker(&mutex); afterNotifiers.insert(n); } //----------------------------------------------------------------------------- @@ -263,7 +270,7 @@ template <typename varT> inline void USER_PROPERTY<varT>::DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); +STG_LOCKER locker(&mutex); afterNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n)); } //----------------------------------------------------------------------------- @@ -276,15 +283,17 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val, bool isPass, bool isSt, STG_LOGGER & logger, - const std::string & sd) + const SETTINGS& s, + REGISTRY & properties) : USER_PROPERTY<varT>(val), stgLogger(logger), isPassword(isPass), isStat(isSt), name(n), - scriptsDir(sd) + settings(s) { +properties.insert(std::make_pair(ToLower(name), this)); } //------------------------------------------------------------------------- template <typename varT> @@ -359,7 +368,12 @@ stgLogger("%s User \'%s\': \'%s\' parameter changed from \'%s\' to \'%s\'. %s", newValue.c_str(), msg.c_str()); -store->WriteUserChgLog(login, admin->GetLogin(), admin->GetIP(), parameter, oldValue, newValue, msg); +for (size_t i = 0; i < settings.GetFilterParamsLog().size(); ++i) + if (settings.GetFilterParamsLog()[i] == "*" || strcasecmp(settings.GetFilterParamsLog()[i].c_str(), parameter.c_str()) == 0) + { + store->WriteUserChgLog(login, admin->GetLogin(), admin->GetIP(), parameter, oldValue, newValue, msg); + return; + } } //------------------------------------------------------------------------- template <typename varT> @@ -369,7 +383,7 @@ void USER_PROPERTY_LOGGED<varT>::OnChange(const std::string & login, const std::string & newValue, const ADMIN * admin) { -std::string filePath = scriptsDir + "/OnChange"; +static std::string filePath = settings.GetScriptsDir() + "/OnChange"; if (access(filePath.c_str(), X_OK) == 0) { @@ -384,11 +398,19 @@ else //------------------------------------------------------------------------- //------------------------------------------------------------------------- //------------------------------------------------------------------------- +inline std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const { - std::map<std::string, USER_PROPERTY_BASE*>::iterator it = params.find(name); - if (it != params.end()) return it->second.ToString(); - else return ""; +REGISTRY::const_iterator it = properties.find(ToLower(name)); +if (it == properties.end()) + return ""; +return it->second->ToString(); +} +//----------------------------------------------------------------------------- +inline +bool USER_PROPERTIES::Exists(const std::string & name) const +{ +return properties.find(ToLower(name)) != properties.end(); } //------------------------------------------------------------------------- //------------------------------------------------------------------------- @@ -401,9 +423,10 @@ return stream << value.ConstData(); } //----------------------------------------------------------------------------- template<typename varT> +inline std::string USER_PROPERTY<varT>::ToString() const { -std::stringstream stream; +std::ostringstream stream; stream << value; return stream.str(); }