TimeLib: Workaround for newlib bug with <+-nn> timezone names

    local WA for both esp8266 and esp32 'till fixed in both core's
    Fix for 8266 already in master  esp8266/Arduino#7702

Signed-off-by: Emil Muratov <gpm@hotplug.ru>

Author: vortigont

EmbUI/timeProcessor.cpp

@@ -24,12 +24,10 @@
 #endif
 
 #define TZ_DEFAULT PSTR("GMT0")         // default Time-Zone
+static const char P_LOC[] PROGMEM = "LOC";
 
 TimeProcessor::TimeProcessor()
 {
-    // moved to the embui wifi management
-    // eGotIPHandler = WiFi.onStationModeGotIP(std::bind(&TimeProcessor::onSTAGotIP, this, std::placeholders::_1));
-    // eDisconnectHandler = WiFi.onStationModeDisconnected(std::bind(&TimeProcessor::onSTADisconnected, this, std::placeholders::_1));
     //configTzTime(); for esp32 https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/esp32-hal-time.c
 
 #ifdef ESP8266
@@ -44,18 +42,10 @@ TimeProcessor::TimeProcessor()
 */
 
     #ifdef TZONE
-        #ifdef ESP8266
-          configTime(TZONE, NTP1ADDRESS, NTP2ADDRESS);
-        #elif defined ESP32
           configTzTime(TZONE, NTP1ADDRESS, NTP2ADDRESS);
-        #endif
         LOG(print, F("TIME: Time Zone set to: "));      LOG(print, TZONE);
     #else
-        #ifdef ESP8266
-          configTime(TZ_DEFAULT, NTP1ADDRESS, NTP2ADDRESS);
-        #elif defined ESP32
           configTzTime(TZ_DEFAULT, NTP1ADDRESS, NTP2ADDRESS);
-        #endif
     #endif
 
     sntp_stop();    // отключаем ntp пока нет подключения к AP
@@ -122,9 +112,31 @@ void TimeProcessor::setTime(const String &timestr){
 void TimeProcessor::tzsetup(const char* tz){
     // https://stackoverflow.com/questions/56412864/esp8266-timezone-issues
     if (!tz || !*tz)
-             return;
+        return;
+
+    /*
+     * newlib has issues with TZ strings with quoted <+-nn> names 
+     * this has been fixed in https://github.com/esp8266/Arduino/pull/7702 for esp8266 (still not in stable as of Nov 16 2020)
+     * but it also affects ESP32 and who knows when to expect a fix there
+     * So let's fix such zones in-place untill core support for both platforms available
+     */
+    if (tz[0] == 0x3C){     // check if first char is '<'
+      String _tz(tz);
+      String _tzfix((char *)0);
+      _tzfix.reserve(sizeof(tz)) ;
+      _tzfix += FPSTR(P_LOC);
+      if (_tz.indexOf('<',1) > 0){  // there might be two <> quotes
+    	//LOG(print, "2nd pos: "); LOG(println, _tz.indexOf('<',1)); 
+        _tzfix += _tz.substring(_tz.indexOf('>')+1, _tz.indexOf('<',1));
+        _tzfix += FPSTR(P_LOC);
+      }
+      _tzfix += _tz.substring(_tz.lastIndexOf('>')+1, _tz.length());
+      setenv("TZ", _tzfix.c_str(), 1/*overwrite*/);
+      LOG(printf_P, PSTR("TIME: TZ fix applied: %s\n"), _tzfix.c_str());
+    } else {
+      setenv("TZ", tz, 1/*overwrite*/);
+    }
 
-    setenv("TZ", tz, 1/*overwrite*/);
     tzset();
     tzone = ""; // сбрасываем костыльную зону
     usehttpzone = false;  // запрещаем использование http