Convert much of the configuration to use c strings

Author: bloft

src/ConfigEntry.cpp

@@ -56,10 +56,41 @@ void ConfigEntry::reset() {
   // ToDo: Remove all child entries (children = NULL;)
 }
 
+long ConfigEntry::getLong(const char *key, long defaultValue) {
+  char cstr[16];
+  get(key).getCValue(cstr);
+  if(strlen(cstr) == 0) {
+    get(key).setValue(String(defaultValue));
+    return defaultValue;
+  }
+  return atol(cstr);
+}
+
 int ConfigEntry::getInt(const char *key, int defaultValue) {
   char cstr[16];
-  itoa(defaultValue, cstr, 10);
-  return getString(key, cstr).toInt();
+  get(key).getCValue(cstr);
+  if(strlen(cstr) == 0) {
+    get(key).setValue(String(defaultValue));
+    return defaultValue;
+  }
+  return atoi(cstr);
+}
+
+double ConfigEntry::getDouble(const char *key, double defaultValue) {
+  char cstr[16];
+  get(key).getCValue(cstr);
+  if(strlen(cstr) == 0) {
+    get(key).setValue(String(defaultValue));
+    return defaultValue;
+  }
+  return atof(cstr);
+}
+void ConfigEntry::getCString(const char *key, const char *defaultValue, char *destination) {
+  get(key).getCValue(destination);
+  if(strlen(destination) == 0) {
+    get(key).setValue(defaultValue);
+    strcpy(destination, defaultValue);
+  }
 }
 
 String ConfigEntry::getString(const char *key, const char *defaultValue) {

src/ConfigEntry.h

@@ -14,7 +14,13 @@ class ConfigEntry : public Entry {
     void load();
     void save();
     void reset();
+    
+    void getCString(const char *key, const char *defaultValue, char *destination);
     String getString(const char *key, const char *defaultValue);
+    
     void setString(const char *key, const char *value);
+    
     int getInt(const char *key, int defaultValue);
+    long getLong(const char *key, long defaultValue);
+    double getDouble(const char *key, double defaultValue);
 };

src/EasyMqtt.cpp

@@ -134,6 +134,7 @@ EasyMqtt::EasyMqtt() : Entry("easyMqtt") {
   get("$system")["online"] << []() {
     return "ON";
   };
+
   get("$system")["time"].setInterval(900); // every 15 min
   get("$system")["time"] << [this]() {
     ntp().update();

src/Entry.cpp

@@ -165,8 +165,8 @@ String Entry::getValue() {
   return lastValue;
 }
 
-const char* Entry::getCValue() {
-  return lastValue.c_str();
+void Entry::getCValue(char * destination) {
+  strcpy(destination, lastValue.c_str());
 }
 
 void Entry::setValue(String value) {

src/Entry.h

@@ -64,7 +64,7 @@ class Entry {
      * Get last value
      */
     String getValue();
-    const char* getCValue();
+    void getCValue(char * destination);
     void setValue(String value);
 
     /**

src/WebPortal.cpp

@@ -65,7 +65,6 @@ void WebPortal::handleRoot() {
   page += FPSTR(HTML_MAIN2);
   page += FPSTR(HTML_CONFIG_HEADER);
   page.replace("{title}", "General");
-  Entry* config = &mqtt->get("$config");
   config->each([&](Entry* entry) {
       if(entry == config) return;
       page += FPSTR(HTML_CONFIG_ENTRY);
@@ -152,7 +151,7 @@ void WebPortal::loop() {
 }
 
 String WebPortal::time(long time) {
-  float utcOffset = 2;
+  double utcOffset = config->getDouble("time.offset", 2);
 
   long localTime = round(ntp->getTime(time) + 3600 * utcOffset);
 
@@ -169,7 +168,9 @@ String WebPortal::time(long time) {
 }
 
 bool WebPortal::auth() {
-    if (!webServer->authenticate("admin", "password")) {
+    char pass[32];
+    config->getCString("web.password", "password", pass);
+    if (!webServer->authenticate("admin", pass)) {
         webServer->requestAuthentication();
         return false;
     }