diff options
Diffstat (limited to 'include/ini.h')
| -rw-r--r-- | include/ini.h | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/include/ini.h b/include/ini.h index 592fba3..a1899a4 100644 --- a/include/ini.h +++ b/include/ini.h @@ -47,68 +47,46 @@ public: * * @param name Name of the php.ini variable * @param value Default value - * @param orig Original value (if the user resets the variable, it is set back to this value) * @param place Place where the ini setting can be changed */ - Ini(const char *name, const char *value, const char *orig, const Place place = Place::All) : - _name(name), _value(value), _orig(orig), _place(place) {} - Ini(const char *name, const char *value, const Place place = Place::All) : - _name(name), _value(value), _orig_empty(true), _place(place) {} + _name(name), _value(value), _place(place) {} /** * Constructors for bool values * * @param name Name of the php.ini variable * @param value Default value - * @param orig Original value (if the user resets the variable, it is set back to this value) * @param place Place where the ini setting can be changed */ - Ini(const char *name,const bool value, const bool orig, const Place place = Place::All) : - _name(name), _value(bool2str(value)), _orig(bool2str(orig)), _place(place) {} - - Ini(const char *name, const bool value, const Place place = Place::All) : - _name(name), _value(bool2str(value)), _orig_empty(true), _place(place) {} + Ini(const char *name, bool value, const Place place = Place::All) : + _name(name), _value(bool2str(value)), _place(place) {} /** * Constructors for integer values * * @param name Name of the php.ini variable * @param value Default value - * @param orig Original value (if the user resets the variable, it is set back to this value) * @param place Place where the ini setting can be changed */ - Ini(const char *name, const int16_t value, const int16_t orig, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig(std::to_string(orig)), _place(place) {} - Ini(const char *name, const int16_t value, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig_empty(true), _place(place) {} - - Ini(const char *name, const int32_t value, const int32_t orig, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig(std::to_string(orig)), _place(place) {} + _name(name), _value(std::to_string(value)), _place(place) {} Ini(const char *name, const int32_t value, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig_empty(true), _place(place) {} - - Ini(const char *name, const int64_t value, const int64_t orig, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig(std::to_string(orig)), _place(place) {} + _name(name), _value(std::to_string(value)), _place(place) {} Ini(const char *name, const int64_t value, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig_empty(true), _place(place) {} + _name(name), _value(std::to_string(value)), _place(place) {} /** * Constructors for floating point values * * @param name Name of the php.ini variable * @param value Default value - * @param orig Original value (if the user resets the variable, it is set back to this value) * @param place Place where the ini setting can be changed */ - Ini(const char *name, const double value, const double orig, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig(std::to_string(orig)), _place(place) {} - Ini(const char *name, const double value, const Place place = Place::All) : - _name(name), _value(std::to_string(value)), _orig_empty(true), _place(place) {} + _name(name), _value(std::to_string(value)), _place(place) {} /** @@ -116,7 +94,7 @@ public: * @param ini_entry * @param module_number */ - void fill(struct _zend_ini_entry *ini_entry, int module_number); + void fill(struct _zend_ini_entry_def *ini_entry, int module_number); private: @@ -148,18 +126,6 @@ private: std::string _value; /** - * ini entry original value - * @var std::string - */ - std::string _orig; - - /** - * Is the orig value set or empty? - * @var bool - */ - bool _orig_empty = false; - - /** * Place where the configuration can be changed * @var Place */ |