Merge pull request #8 from ab-tools/1.3.3

Added webServerPreCallback to init method that allows adding a callba…

ReadMe.md

@@ -20,8 +20,7 @@ void setup()
  WiFiManager wifiManager;
 
  WiFiManagerNS::init( &wifiManager );
- // WiFiManagerNS::init( &wifiManager, nullptr ); // using nullptr to prevent WiFiManagerTz from overwriting WiFiManager favicon
- // WiFiManagerNS::init( &wifiManager, myFaviconCallback ); // using a custom callback to emit favicon
+ // WiFiManagerNS::init( &wifiManager, webserverPreCallback ); // using a custom callback add/override server routes
 
  // /!\ make sure "custom" is listed there as it's required to pull the "Setup Clock" button
  std::vector<const char *> menu = {"wifi", "info", "custom", "param", "sep", "restart", "exit"};

src/WiFiManagerTz.h

@@ -15,9 +15,7 @@ namespace WiFiManagerNS
  String TimeConfHTML;
  char systime[64];
 
- typedef void(*faviconCallback_t)();
- faviconCallback_t handleFavicon = nullptr;
- void handleFavicon_default();
+ std::function<void()> _webserverPreCallback;
  void bindServerCallback();
 
 
@@ -57,8 +55,6 @@ namespace WiFiManagerNS
 
  #else // defined WiFiManager_h
 
- #include "strings_en.h"
-
 
  constexpr const char* menuhtml = "<form action='/custom' method='get'><button>Setup Clock</button></form><br/>\n";
 
@@ -128,9 +124,11 @@ namespace WiFiManagerNS
  WiFiManager *_wifiManager;
 
 
- void init(WiFiManager *manager, faviconCallback_t faviconCB=handleFavicon_default)
+
+ void init(WiFiManager *manager, std::function<void()> webserverPreCallback)
  {
- handleFavicon = faviconCB;
+ _webserverPreCallback = webserverPreCallback;
+
  _wifiManager = manager;
  _wifiManager->setWebServerCallback(bindServerCallback);
  _wifiManager->setCustomMenuHTML( menuhtml );
@@ -144,7 +142,7 @@ namespace WiFiManagerNS
  }
 
 
- void handleFavicon_default()
+ void handleFavicon()
  {
  _wifiManager->server->send_P(200, "image/gif", favicon, sizeof(favicon) );
  }
@@ -305,11 +303,13 @@ namespace WiFiManagerNS
 
  void bindServerCallback()
  {
+ if (_webserverPreCallback != NULL) {
+ _webserverPreCallback(); // callback to add/override server routes
+ }
+
  _wifiManager->server->on("/custom", handleRoute);
  _wifiManager->server->on("/save-tz", handleValues);
- if( handleFavicon ) {
- _wifiManager->server->on("/favicon.ico", handleFavicon);
- }
+ _wifiManager->server->on("/favicon.ico", handleFavicon);
  }
 
  #endif