GCC version, warnings.

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index da60ff1c7362f26772dcf50f0b848fc2b171bdd6..4a26b21144dc5e2c908c70ba0eacbfaea3384be4 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -18,6 +18,7 @@ $Author: faust $
 
 #include "stg/logger.h"
 #include "stg/locker.h"
 
 #include "stg/logger.h"
 #include "stg/locker.h"

+#include "stg/settings.h"

 #include "stg/scriptexecuter.h"
 #include "stg/common.h"
 
 #include "stg/scriptexecuter.h"
 #include "stg/common.h"
 


@@ -33,10 +34,12 @@ public:
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------

+typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY;
+//-----------------------------------------------------------------------------

 template<typename varT>
 class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:
 template<typename varT>
 class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:

-    USER_PROPERTY(varT & val);
+    explicit USER_PROPERTY(varT & val);

     virtual ~USER_PROPERTY();
 
     void Set(const varT & rvalue);
     virtual ~USER_PROPERTY();
 
     void Set(const varT & rvalue);


@@ -74,11 +77,12 @@ public:
                          bool isPassword,
                          bool isStat,
                          STG_LOGGER & logger,
                          bool isPassword,
                          bool isStat,
                          STG_LOGGER & logger,

-                         const std::string & sd,
-                         std::map<std::string, USER_PROPERTY_BASE*> & properties);
+                         const SETTINGS & s,
+                         REGISTRY & properties);

     virtual ~USER_PROPERTY_LOGGED() {}
 
     USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; }
     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,
     const varT & Get() const { return USER_PROPERTY<varT>::ConstData(); }
     const std::string & GetName() const { return name; }
     bool Set(const varT & val,


@@ -109,7 +113,7 @@ private:
     bool              isPassword;
     bool              isStat;
     std::string       name;
     bool              isPassword;
     bool              isStat;
     std::string       name;

-    const std::string scriptsDir;
+    const SETTINGS&   settings;

 };
 //-----------------------------------------------------------------------------
 class USER_PROPERTIES : private NONCOPYABLE {
 };
 //-----------------------------------------------------------------------------
 class USER_PROPERTIES : private NONCOPYABLE {


@@ -121,15 +125,13 @@ class USER_PROPERTIES : private NONCOPYABLE {
  начале идет закрытая секция
  * */
 
  начале идет закрытая секция
  * */
 

-public:
-    typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY;

 private:
     USER_STAT stat;
     USER_CONF conf;
 
     REGISTRY properties;
 public:
 private:
     USER_STAT stat;
     USER_CONF conf;
 
     REGISTRY properties;
 public:

-    USER_PROPERTIES(const std::string & sd);
+    explicit USER_PROPERTIES(const SETTINGS& s);

 
     USER_STAT & Stat() { return stat; }
     USER_CONF & Conf() { return conf; }
 
     USER_STAT & Stat() { return stat; }
     USER_CONF & Conf() { return conf; }


@@ -214,7 +216,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::Set(const varT & rvalue)
 {
 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;
 
 
 typename std::set<PROPERTY_NOTIFIER_BASE<varT> *>::iterator ni;
 


@@ -244,7 +246,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {

-STG_LOCKER locker(&mutex, __FILE__, __LINE__);
+STG_LOCKER locker(&mutex);

 beforeNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 beforeNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------


@@ -252,7 +254,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 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));
 }
 //-----------------------------------------------------------------------------
 beforeNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------


@@ -260,7 +262,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {

-STG_LOCKER locker(&mutex, __FILE__, __LINE__);
+STG_LOCKER locker(&mutex);

 afterNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 afterNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------


@@ -268,7 +270,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 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));
 }
 //-----------------------------------------------------------------------------
 afterNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------


@@ -281,15 +283,15 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
                                                  bool isPass,
                                                  bool isSt,
                                                  STG_LOGGER & logger,
                                                  bool isPass,
                                                  bool isSt,
                                                  STG_LOGGER & logger,

-                                                 const std::string & sd,
-                                                 USER_PROPERTIES::REGISTRY & properties)
+                                                 const SETTINGS& s,
+                                                 REGISTRY & properties)

 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),
       isPassword(isPass),
       isStat(isSt),
       name(n),
 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),
       isPassword(isPass),
       isStat(isSt),
       name(n),

-      scriptsDir(sd)
+      settings(s)

 {
 properties.insert(std::make_pair(ToLower(name), this));
 }
 {
 properties.insert(std::make_pair(ToLower(name), this));
 }


@@ -366,7 +368,12 @@ stgLogger("%s User \'%s\': \'%s\' parameter changed from \'%s\' to \'%s\'. %s",
           newValue.c_str(),
           msg.c_str());
 
           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>
 }
 //-------------------------------------------------------------------------
 template <typename varT>


@@ -376,7 +383,7 @@ void USER_PROPERTY_LOGGED<varT>::OnChange(const std::string & login,
                                           const std::string & newValue,
                                           const ADMIN * admin)
 {
                                           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)
     {
 
 if (access(filePath.c_str(), X_OK) == 0)
     {