From: Naffanya <naffanya@naffanya.(none)>
Date: Wed, 29 Jan 2014 21:04:05 +0000 (+0200)
Subject: Search parameter in map case insensitive
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/b3139bf3f37b3b0244efea8b4b5e5a7d0bc90095?ds=inline;hp=--cc

Search parameter in map case insensitive
---

b3139bf3f37b3b0244efea8b4b5e5a7d0bc90095
diff --cc include/stg/user_property.h
index 7c0f4da1,1716296a..398c4579
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@@ -19,6 -18,6 +19,7 @@@ $Author: faust 
  #include "stg/logger.h"
  #include "stg/locker.h"
  #include "stg/scriptexecuter.h"
++#include "stg/common.h"
  
  #include "store.h"
  #include "admin.h"
@@@ -288,7 -277,6 +289,7 @@@ USER_PROPERTY_LOGGED<varT>::USER_PROPER
        name(n),
        scriptsDir(sd)
  {
- properties.insert(std::make_pair(name, this));
++properties.insert(std::make_pair(ToLower(name), this));
  }
  //-------------------------------------------------------------------------
  template <typename varT>
diff --cc projects/stargazer/user_impl.h
index 38d3c013,150f2a8b..5b51fc5d
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@@ -209,9 -215,10 +215,10 @@@ public
      void            ProcessDayFee();
      void            ProcessDayFeeSpread();
      void            ProcessNewMonth();
+     void            ProcessDailyFee();
  
      bool            IsInetable();
 -    std::string     GetEnabledDirs();
 +    std::string     GetEnabledDirs() const;
  
      void            OnAdd();
      void            OnDelete();
diff --cc projects/stargazer/user_property.cpp
index a94b60a4,f5f5eeea..a0c974bc
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@@ -3,40 -3,40 +3,39 @@@
  USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
      : stat(),
        conf(),
 -      cash            (stat.cash,             "cash",             false, true, GetStgLogger(), sd),
 -      up              (stat.monthUp,          "upload",           false, true, GetStgLogger(), sd),
 -      down            (stat.monthDown,        "download",         false, true, GetStgLogger(), sd),
 -      lastCashAdd     (stat.lastCashAdd,      "lastCashAdd",      false, true, GetStgLogger(), sd),
 -      passiveTime     (stat.passiveTime,      "passiveTime",      false, true, GetStgLogger(), sd),
 -      lastCashAddTime (stat.lastCashAddTime,  "lastCashAddTime",  false, true, GetStgLogger(), sd),
 -      freeMb          (stat.freeMb,           "freeMb",           false, true, GetStgLogger(), sd),
 -      lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd),
 +      cash            (stat.cash,             "cash",             false, true, GetStgLogger(), sd, properties),
-       up              (stat.up,               "upload",           false, true, GetStgLogger(), sd, properties),
-       down            (stat.down,             "download",         false, true, GetStgLogger(), sd, properties),
++      up              (stat.monthUp,          "upload",           false, true, GetStgLogger(), sd, properties),
++      down            (stat.monthDown,        "download",         false, true, GetStgLogger(), sd, properties),
 +      lastCashAdd     (stat.lastCashAdd,      "lastCashAdd",      false, true, GetStgLogger(), sd, properties),
 +      passiveTime     (stat.passiveTime,      "passiveTime",      false, true, GetStgLogger(), sd, properties),
 +      lastCashAddTime (stat.lastCashAddTime,  "lastCashAddTime",  false, true, GetStgLogger(), sd, properties),
 +      freeMb          (stat.freeMb,           "freeMb",           false, true, GetStgLogger(), sd, properties),
 +      lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd, properties),
  
--
 -      password    (conf.password,     "password",     true,  false, GetStgLogger(), sd),
 -      passive     (conf.passive,      "passive",      false, false, GetStgLogger(), sd),
 -      disabled    (conf.disabled,     "disabled",     false, false, GetStgLogger(), sd),
 -      disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd),
 -      alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd),
 -      tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd),
 -      nextTariff  (conf.nextTariff,   "new tariff",   false, false, GetStgLogger(), sd),
 -      address     (conf.address,      "address",      false, false, GetStgLogger(), sd),
 -      note        (conf.note,         "note",         false, false, GetStgLogger(), sd),
 -      group       (conf.group,        "group",        false, false, GetStgLogger(), sd),
 -      email       (conf.email,        "email",        false, false, GetStgLogger(), sd),
 -      phone       (conf.phone,        "phone",        false, false, GetStgLogger(), sd),
 -      realName    (conf.realName,     "realName",     false, false, GetStgLogger(), sd),
 -      credit      (conf.credit,       "credit",       false, false, GetStgLogger(), sd),
 -      creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd),
 -      ips         (conf.ips,          "IP",           false, false, GetStgLogger(), sd),
 -      userdata0   (conf.userdata[0],  "userdata0",    false, false, GetStgLogger(), sd),
 -      userdata1   (conf.userdata[1],  "userdata1",    false, false, GetStgLogger(), sd),
 -      userdata2   (conf.userdata[2],  "userdata2",    false, false, GetStgLogger(), sd),
 -      userdata3   (conf.userdata[3],  "userdata3",    false, false, GetStgLogger(), sd),
 -      userdata4   (conf.userdata[4],  "userdata4",    false, false, GetStgLogger(), sd),
 -      userdata5   (conf.userdata[5],  "userdata5",    false, false, GetStgLogger(), sd),
 -      userdata6   (conf.userdata[6],  "userdata6",    false, false, GetStgLogger(), sd),
 -      userdata7   (conf.userdata[7],  "userdata7",    false, false, GetStgLogger(), sd),
 -      userdata8   (conf.userdata[8],  "userdata8",    false, false, GetStgLogger(), sd),
 -      userdata9   (conf.userdata[9],  "userdata9",    false, false, GetStgLogger(), sd)
 +      password    (conf.password,     "password",     true,  false, GetStgLogger(), sd, properties),
 +      passive     (conf.passive,      "passive",      false, false, GetStgLogger(), sd, properties),
 +      disabled    (conf.disabled,     "disabled",     false, false, GetStgLogger(), sd, properties),
 +      disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
 +      alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
 +      tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd, properties),
 +      nextTariff  (conf.nextTariff,   "new tariff",   false, false, GetStgLogger(), sd, properties),
 +      address     (conf.address,      "address",      false, false, GetStgLogger(), sd, properties),
 +      note        (conf.note,         "note",         false, false, GetStgLogger(), sd, properties),
 +      group       (conf.group,        "group",        false, false, GetStgLogger(), sd, properties),
 +      email       (conf.email,        "email",        false, false, GetStgLogger(), sd, properties),
 +      phone       (conf.phone,        "phone",        false, false, GetStgLogger(), sd, properties),
 +      realName    (conf.realName,     "realName",     false, false, GetStgLogger(), sd, properties),
 +      credit      (conf.credit,       "credit",       false, false, GetStgLogger(), sd, properties),
 +      creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd, properties),
 +      ips         (conf.ips,          "ips",          false, false, GetStgLogger(), sd, properties),
 +      userdata0   (conf.userdata[0],  "userdata0",    false, false, GetStgLogger(), sd, properties),
 +      userdata1   (conf.userdata[1],  "userdata1",    false, false, GetStgLogger(), sd, properties),
 +      userdata2   (conf.userdata[2],  "userdata2",    false, false, GetStgLogger(), sd, properties),
 +      userdata3   (conf.userdata[3],  "userdata3",    false, false, GetStgLogger(), sd, properties),
 +      userdata4   (conf.userdata[4],  "userdata4",    false, false, GetStgLogger(), sd, properties),
 +      userdata5   (conf.userdata[5],  "userdata5",    false, false, GetStgLogger(), sd, properties),
 +      userdata6   (conf.userdata[6],  "userdata6",    false, false, GetStgLogger(), sd, properties),
 +      userdata7   (conf.userdata[7],  "userdata7",    false, false, GetStgLogger(), sd, properties),
 +      userdata8   (conf.userdata[8],  "userdata8",    false, false, GetStgLogger(), sd, properties),
 +      userdata9   (conf.userdata[9],  "userdata9",    false, false, GetStgLogger(), sd, properties)
  {}