Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 20ca6fd8052fe33336a3c66b89292a6da0462239..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"
 


@@ -38,7 +39,7 @@ 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);


@@ -76,7 +77,7 @@ public:
                          bool isPassword,
                          bool isStat,
                          STG_LOGGER & logger,
                          bool isPassword,
                          bool isStat,
                          STG_LOGGER & logger,

-                         const std::string & sd,
+                         const SETTINGS & s,

                          REGISTRY & properties);
     virtual ~USER_PROPERTY_LOGGED() {}
 
                          REGISTRY & properties);
     virtual ~USER_PROPERTY_LOGGED() {}
 


@@ -112,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 {


@@ -130,7 +131,7 @@ private:
 
     REGISTRY properties;
 public:
 
     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; }


@@ -282,7 +283,7 @@ 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,
+                                                 const SETTINGS& s,

                                                  REGISTRY & properties)
 
     : USER_PROPERTY<varT>(val),
                                                  REGISTRY & properties)
 
     : USER_PROPERTY<varT>(val),


@@ -290,7 +291,7 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
       isPassword(isPass),
       isStat(isSt),
       name(n),
       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));
 }


@@ -367,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>


@@ -377,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)
     {