From baba38b56371b4dd65226409847d022b4bb57446 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:26:34 +0200 Subject: [PATCH] Update about webpage --- src/sys/svc/hasp_http.cpp | 29 +++++++++++++++-------------- src/sys/svc/hasp_http_async.cpp | 29 +++++++++++++++-------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index c872fac2..c41eb750 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -498,44 +498,45 @@ void webHandleAbout() if(!httpIsAuthenticated(F("about"))) return; { + String mitLicense((char*)0); + mitLicense = FPSTR(MIT_LICENSE); + String httpMessage((char*)0); httpMessage.reserve(HTTP_PAGE_SIZE); - httpMessage += F("

openHASP/h3>Copyright© 2019-2021 Francis Van Roie "); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += F("

openHASP

Copyright© 2019-2021 Francis Van Roie "); + httpMessage += mitLicense; httpMessage += F("

Based on the previous work of the following open source developers.


"); httpMessage += F("

HASwitchPlate

Copyright© 2019 Allen Derusha allen@derusha.org"); - httpMessage += FPSTR(MIT_LICENSE); - httpMessage += - F("

LittlevGL

Copyright© 2016 Gábor Kiss-Vámosi
Copyright© 2019 " - "LittlevGL"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; + httpMessage += F("

LVGL

Copyright© 2021 LVGL Kft"); + httpMessage += mitLicense; httpMessage += F("

zi Font Engine

Copyright© 2020-2021 Francis Van Roie"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

TFT_eSPI Library

Copyright© 2020 Bodmer (https://github.com/Bodmer) All " "rights reserved.
FreeBSD License

"); httpMessage += F("

includes parts from the Adafruit_GFX library
Copyright© 2012 Adafruit Industries. " "All rights reserved
BSD License

"); httpMessage += F("

ArduinoJson

Copyright© 2014-2021 Benoit BLANCHON"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

PubSubClient

Copyright© 2008-2015 Nicholas O'Leary"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

ArduinoLog

Copyright© 2017,2018 Thijs Elenbaas, MrRobot62, rahuldeo2047, NOX73, " "dhylands, Josha blemasle, mfalkvidd"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; #if HASP_USE_SYSLOG > 0 // Replaced with WiFiUDP client // httpMessage += F("

Syslog

Copyright© 2016 Martin Sloup"); - // httpMessage += FPSTR(MIT_LICENSE); + // httpMessage += mitLicense; #endif #if HASP_USE_QRCODE > 0 httpMessage += F("

QR Code generator

Copyright© Project Nayuki"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; #endif httpMessage += F("

AceButton

Copyright© 2018 Brian T. Park"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += FPSTR(MAIN_MENU_BUTTON); diff --git a/src/sys/svc/hasp_http_async.cpp b/src/sys/svc/hasp_http_async.cpp index d94c391e..fdb78dc7 100644 --- a/src/sys/svc/hasp_http_async.cpp +++ b/src/sys/svc/hasp_http_async.cpp @@ -482,43 +482,44 @@ void webHandleAbout(AsyncWebServerRequest* request) { // http://plate01/about if(!httpIsAuthenticated(request, F("about"))) return; + String mitLicense((char*)0); + mitLicense = FPSTR(MIT_LICENSE); + String httpMessage((char*)0); httpMessage.reserve(HTTP_PAGE_SIZE); - httpMessage += F("

openHASP/h3>Copyright© 2019-2021 Francis Van Roie "); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += F("

openHASP

Copyright© 2019-2021 Francis Van Roie "); + httpMessage += mitLicense; httpMessage += F("

Based on the previous work of the following open source developers.


"); httpMessage += F("

HASwitchPlate

Copyright© 2019 Allen Derusha allen@derusha.org"); - httpMessage += FPSTR(MIT_LICENSE); - httpMessage += - F("

LittlevGL

Copyright© 2016 Gábor Kiss-Vámosi
Copyright© 2019 " - "LittlevGL"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; + httpMessage += F("

LVGL

Copyright© 2021 LVGL Kft"); + httpMessage += mitLicense; httpMessage += F("

zi Font Engine

Copyright© 2020-2021 Francis Van Roie"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

TFT_eSPI Library

Copyright© 2020 Bodmer (https://github.com/Bodmer) All " "rights reserved.
FreeBSD License

"); httpMessage += F("

includes parts from the Adafruit_GFX library
Copyright© 2012 Adafruit Industries. " "All rights reserved
BSD License

"); httpMessage += F("

ArduinoJson

Copyright© 2014-2021 Benoit BLANCHON"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

PubSubClient

Copyright© 2008-2015 Nicholas O'Leary"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += F("

ArduinoLog

Copyright© 2017,2018 Thijs Elenbaas, MrRobot62, rahuldeo2047, NOX73, " "dhylands, Josha blemasle, mfalkvidd"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; #if HASP_USE_SYSLOG > 0 // Replaced with WiFiUDP client // httpMessage += F("

Syslog

Copyright© 2016 Martin Sloup"); - // httpMessage += FPSTR(MIT_LICENSE); + // httpMessage += mitLicense; #endif #if HASP_USE_QRCODE > 0 httpMessage += F("

QR Code generator

Copyright© Project Nayuki"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; #endif httpMessage += F("

AceButton

Copyright© 2018 Brian T. Park"); - httpMessage += FPSTR(MIT_LICENSE); + httpMessage += mitLicense; httpMessage += FPSTR(MAIN_MENU_BUTTON);