add-to-calendar-button 2.6.20 → 2.6.21

package/dist/commonjs/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const tzlibActions = require('timezones-ical-library');
 /*!
  *  @preserve
@@ -7,14 +6,14 @@ const tzlibActions = require('timezones-ical-library');
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.20
+ *  Version: 2.6.21
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.6.20';
+const atcbVersion = '2.6.21';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -57,7 +56,7 @@ const atcbIsAndroid = atcbIsBrowser()
     };*/
 const atcbIsSafari = atcbIsBrowser()
   ? () => {
-      if (/^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent)) {
+      if (/^(?:(?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -75,7 +74,7 @@ const atcbIsMobile = () => {
 };
 const atcbIsWebView = atcbIsBrowser()
   ? () => {
-      if (/(; ?wv|(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari))/i.test(navigator.userAgent)) {
+      if (/; ?wv|(?:iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -86,7 +85,7 @@ const atcbIsWebView = atcbIsBrowser()
     };
 const atcbIsProblematicWebView = atcbIsBrowser()
   ? () => {
-      if (/(Instagram)/i.test(navigator.userAgent)) {
+      if (/Instagram/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -305,7 +304,7 @@ function atcb_decorate_data_timezone(tz = null) {
 function atcb_decorate_data_rrule(data) {
   if (data.recurrence && data.recurrence !== '') {
     data.recurrence = data.recurrence.replace(/\s+/g, '').toUpperCase();
-    if (!/^(RRULE:[\w=;,:+-/\\]+|daily|weekly|monthly|yearly)$/im.test(data.recurrence)) {
+    if (!/^(?:RRULE:[\w=;,:+\-/\\]+|daily|weekly|monthly|yearly)$/im.test(data.recurrence)) {
       data.recurrence = '!wrong rrule format!';
     } else {
       if (/^RRULE:/i.test(data.recurrence)) {
@@ -548,8 +547,7 @@ function atcb_decorate_data_description(data, i) {
     description = cleanDescription(description);
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^a-zA-Z0-9\-_.]/g, '');
-        // eslint-disable-next-line security/detect-non-literal-regexp
+        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
         description = description.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
       }
     }
@@ -608,10 +606,8 @@ function atcb_decorate_data_extend(data) {
     }
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^a-zA-Z0-9\-_.]/g, '');
-        // eslint-disable-next-line security/detect-non-literal-regexp
+        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
         data.dates[`${i}`].name = data.dates[`${i}`].name.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
-        // eslint-disable-next-line security/detect-non-literal-regexp
         data.dates[`${i}`].location = data.dates[`${i}`].location.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
       }
     }
@@ -630,7 +626,7 @@ function atcb_date_cleanup(dateTimeData) {
   }
   const endpoints = ['start', 'end'];
   endpoints.forEach(function (point) {
-    if (!/^(\d{4}-\d{2}-\d{2}T?(?:\d{2}:\d{2}|)Z?|today(?:\+\d{1,4}|))$/i.test(dateTimeData[point + 'Date'])) {
+    if (!/^(?:\d{4}-\d{2}-\d{2}T?(?:\d{2}:\d{2})?Z?|today(?:\+\d{1,4})?)$/i.test(dateTimeData[point + 'Date'])) {
       dateTimeData[point + 'Date'] = 'badly-formed';
     } else {
       dateTimeData[point + 'Date'] = atcb_date_calculation(dateTimeData[point + 'Date']);
@@ -835,7 +831,7 @@ async function atcb_validate_buttonStyle(data, msgPrefix) {
   if (!availableStyles.includes(data.buttonStyle)) {
     throw new Error(msgPrefix + ' failed: provided buttonStyle invalid');
   }
-  if (data.customCss && data.customCss !== '' && (!atcb_secure_url(data.customCss, false) || !/\.css($|\?)/.test(data.customCss))) {
+  if (data.customCss && data.customCss !== '' && (!atcb_secure_url(data.customCss, false) || !/\.css(?:$|\?)/.test(data.customCss))) {
     throw new Error(msgPrefix + ' failed: customCss provided, but no valid url');
   }
   if ((!data.customCss || data.customCss === '') && data.buttonStyle === 'custom') {
@@ -936,7 +932,7 @@ async function atcb_validate_attendee(data, msgPrefix, i, msgSuffix) {
   return true;
 }
 async function atcb_validate_uid(data, msgPrefix, i, msgSuffix) {
-  if (!/^(\w|-){1,254}$/.test(data.dates[`${i}`].uid)) {
+  if (!/^(?:\w|-){1,254}$/.test(data.dates[`${i}`].uid)) {
     if (data.debug) {
       console.warn(msgPrefix + ': UID not valid. May only contain alpha, digits, and dashes; and be less than 255 characters. Falling back to an automated value!' + msgSuffix);
     }
@@ -1005,7 +1001,7 @@ async function atcb_validate_rrule(data, msgPrefix) {
   if (data.recurrence && data.recurrence !== '' && data.dates.length > 1) {
     throw new Error(msgPrefix + ' failed: RRULE and multi-date set at the same time');
   }
-  if (data.recurrence && data.recurrence !== '' && !/^RRULE:[\w=;,:+-/\\]+$/i.test(data.recurrence)) {
+  if (data.recurrence && data.recurrence !== '' && !/^RRULE:[\w=;,:+\-/\\]+$/i.test(data.recurrence)) {
     throw new Error(msgPrefix + ' failed: RRULE data misspelled');
   }
   return true;
@@ -1014,22 +1010,22 @@ async function atcb_validate_rrule_simplyfied(data, msgPrefix) {
   if (data.recurrence_interval && (data.recurrence_interval < 1 || data.recurrence_interval % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_until && data.recurrence_until !== '' && !/^(\d|-|:)+$/i.test(data.recurrence_until)) {
+  if (data.recurrence_until && data.recurrence_until !== '' && !/^[\d\-:]+$/.test(data.recurrence_until)) {
     throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled');
   }
   if (data.recurrence_count && (data.recurrence_count < 1 || data.recurrence_count % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_byMonth && data.recurrence_byMonth !== '' && !/^(\d|,)+$/.test(data.recurrence_byMonth)) {
+  if (data.recurrence_byMonth && data.recurrence_byMonth !== '' && !/^[\d,]+$/.test(data.recurrence_byMonth)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byMonth) misspelled');
   }
-  if (data.recurrence_byMonthDay && data.recurrence_byMonthDay !== '' && !/^(\d|,)+$/.test(data.recurrence_byMonthDay)) {
+  if (data.recurrence_byMonthDay && data.recurrence_byMonthDay !== '' && !/^[\d,]+$/.test(data.recurrence_byMonthDay)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byMonthDay) misspelled');
   }
-  if (data.recurrence_byDay && data.recurrence_byDay !== '' && !/^(\d|-|MO|TU|WE|TH|FR|SA|SU|,)+$/im.test(data.recurrence_byDay)) {
+  if (data.recurrence_byDay && data.recurrence_byDay !== '' && !/^(?:[\d,-]|MO|TU|WE|TH|FR|SA|SU)+$/im.test(data.recurrence_byDay)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byDay) misspelled');
   }
-  if (data.recurrence_weekstart && data.recurrence_weekstart !== '' && !/^(MO|TU|WE|TH|FR|SA|SU)$/im.test(data.recurrence_weekstart)) {
+  if (data.recurrence_weekstart && data.recurrence_weekstart !== '' && !/^(?:MO|TU|WE|TH|FR|SA|SU)$/im.test(data.recurrence_weekstart)) {
     throw new Error(msgPrefix + ' failed: recurrence data (weekstart) misspelled');
   }
   return true;
@@ -2261,7 +2257,8 @@ function atcb_create_atcbl(host, atList = true, returnEl = false, licenseNoteOnl
     }
   } else {
     atcbL.innerHTML = 'Using the <a href="https://add-to-calendar-pro.com" target="_blank" rel="noopener referrer">Add to Calendar Button</a>, licensed under the Elastic License 2.0 (ELv2).';
-    atcbL.setAttribute('style', 'none !important');
+    atcbL.setAttribute('style', 'display:none !important');
+    atcbL.classList.add('atcb-attribution');
     host.append(atcbL);
   }
   if (returnEl) return null;
@@ -2938,7 +2935,7 @@ function atcb_subscribe_ical(data, fileUrl) {
 function atcb_subscribe_google(data, fileUrl) {
   const baseUrl = 'https://calendar.google.com/calendar/r?cid=';
   const baseUrlApp = 'calendar.google.com/calendar?cid=';
-  const fileUrlRegex = /^(https?:\/\/|webcal:\/\/|\/\/)calendar\.google\.com\//;
+  const fileUrlRegex = /^(?:https?:\/\/|webcal:\/\/|\/\/)calendar\.google\.com\//;
   const newFileUrl = (function () {
     if (fileUrlRegex.test(fileUrl)) {
       return fileUrl.replace(/^(.)*\?cid=/, '');
@@ -2973,7 +2970,7 @@ function atcb_generate_google(data, date, subEvent = 'all') {
   urlParts.push('https://calendar.google.com/calendar/render?action=TEMPLATE');
   const formattedDate = atcb_generate_time(date, 'clean', 'google');
   urlParts.push('dates=' + encodeURIComponent(formattedDate.start) + '%2F' + encodeURIComponent(formattedDate.end));
-  if (date.timeZone && date.timeZone !== '' && !/(GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|WET)/i.test(date.timeZone) && !formattedDate.allday) {
+  if (date.timeZone && date.timeZone !== '' && !/GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|MET|MST|PST8PDT|WET/i.test(date.timeZone) && !formattedDate.allday) {
     urlParts.push('ctz=' + date.timeZone);
   }
   if (date.name && date.name !== '') {
@@ -3124,7 +3121,6 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
         return;
       }
     }
-    // eslint-disable-next-line security/detect-non-literal-fs-filename
     const newTab = window.open(url, target);
     if (newTab) {
       newTab.focus();
@@ -3346,7 +3342,7 @@ function atcb_generate_time(data, style = 'delimiters', targetCal = 'general', a
       }
       return durationHours + ':' + ('0' + durationMinutes).slice(-2);
     })();
-    if (targetCal == 'ical' || (targetCal == 'google' && !/(GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|WET)/i.test(data.timeZone))) {
+    if (targetCal == 'ical' || (targetCal == 'google' && !/GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|MET|MST|PST8PDT|WET/i.test(data.timeZone))) {
       return {
         start: atcb_format_datetime(newStartDate, 'clean', true, true),
         end: atcb_format_datetime(newEndDate, 'clean', true, true),
@@ -3668,7 +3664,7 @@ function atcb_secure_url(url, throwError = true) {
   }
 }
 function atcb_validEmail(email) {
-  if (!/^.{0,70}@.{1,30}\.[a-zA-Z]{2,9}$/.test(email)) {
+  if (!/^.{0,70}@.{1,30}\.[a-z]{2,9}$/i.test(email)) {
     return false;
   }
   return true;
@@ -3686,9 +3682,9 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     content = content.replace(/\{url\}(.+?)\{\/url\}/gi, (match, p1) => {
       return p1.split('|')[0];
     });
-    content = content.replace(/\[(|\/)(hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '');
-    content = content.replace(/\{(|\/)(hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '');
-    content = content.replace(/&[#a-zA-Z0-9]{1,9};/gi, '');
+    content = content.replace(/\[\/?(hr|[pbui]|strong|em|li|ul|ol|h\d)\]/gi, '');
+    content = content.replace(/\{\/?(hr|[pbui]|strong|em|li|ul|ol|h\d)\}/gi, '');
+    content = content.replace(/&[#a-z0-9]{1,9};/gi, '');
   } else {
     content = content.replace(/\[url\]((?:(?!\[\/url\]).)*)\[\/url\]/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
@@ -3696,8 +3692,8 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     content = content.replace(/\{url\}((?:(?!\[\/url\]).)*)\{\/url\}/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
     });
-    content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)(\s?\/?)\]/gi, '<$1$2$3>');
-    content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)(\s?\/?)\}/gi, '<$1$2$3>');
+    content = content.replace(/\[(\/)?(br|hr|[pbui]|strong|em|li|ul|ol|h\d)(\s?\/?)\]/gi, '<$1$2$3>');
+    content = content.replace(/\{(\/)?(br|hr|[pbui]|strong|em|li|ul|ol|h\d)(\s?\/?)\}/gi, '<$1$2$3>');
   }
   return content;
 }
@@ -4907,7 +4903,7 @@ if (atcbIsBrowser()) {
         this.data.identifier = this.identifier;
       } else {
         if (this.data.identifier && this.data.identifier !== '') {
-          if (!/^[\w\-_]+$/.test(this.data.identifier)) {
+          if (!/^[\w-]+$/.test(this.data.identifier)) {
             this.data.identifier = '';
             if (this.debug) {
               let prefix = 'Add to Calendar Button';
@@ -5105,7 +5101,7 @@ async function atcb_load_css(host, rootObj = null, data) {
     const cssGlobalContent = document.createElement('style');
     cssGlobalContent.id = 'atcb-global-style';
     const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth;
-    cssGlobalContent.innerText = '.atcb-modal-no-scroll{overflow-y:hidden !important;-webkit-overflow-scrolling:touch;} body.atcb-modal-no-scroll{padding-right:' + scrollBarWidth + 'px;}';
+    cssGlobalContent.innerText = '.atcb-modal-no-scroll{overflow-y:hidden !important;-webkit-overflow-scrolling:touch;} body.atcb-modal-no-scroll{padding-right:' + scrollBarWidth + 'px;}.atcb-attribution{display:none;}';
     if (nonceVal) {
       cssGlobalContent.setAttribute('nonce', nonceVal);
     }
@@ -5254,7 +5250,7 @@ async function atcb_action(inputData, triggerElement, keyboardTrigger = false) {
     if (triggerElement.id && triggerElement.id !== '') {
       data.identifier = triggerElement.id;
     } else {
-      if (data.identifier && data.identifier != '' && /^[\w\-_]+$/.test(data.identifier)) {
+      if (data.identifier && data.identifier != '' && /^[\w-]+$/.test(data.identifier)) {
         data.identifier = 'atcb-btn-' + data.identifier;
       } else {
         data.identifier = 'atcb-btn-custom';

package/dist/commonjs/no-pro/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const tzlibActions = require('timezones-ical-library');
 /*!
  *  @preserve
@@ -7,14 +6,14 @@ const tzlibActions = require('timezones-ical-library');
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.20
+ *  Version: 2.6.21
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.6.20';
+const atcbVersion = '2.6.21';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -57,7 +56,7 @@ const atcbIsAndroid = atcbIsBrowser()
     };*/
 const atcbIsSafari = atcbIsBrowser()
   ? () => {
-      if (/^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent)) {
+      if (/^(?:(?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -75,7 +74,7 @@ const atcbIsMobile = () => {
 };
 const atcbIsWebView = atcbIsBrowser()
   ? () => {
-      if (/(; ?wv|(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari))/i.test(navigator.userAgent)) {
+      if (/; ?wv|(?:iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -86,7 +85,7 @@ const atcbIsWebView = atcbIsBrowser()
     };
 const atcbIsProblematicWebView = atcbIsBrowser()
   ? () => {
-      if (/(Instagram)/i.test(navigator.userAgent)) {
+      if (/Instagram/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -305,7 +304,7 @@ function atcb_decorate_data_timezone(tz = null) {
 function atcb_decorate_data_rrule(data) {
   if (data.recurrence && data.recurrence !== '') {
     data.recurrence = data.recurrence.replace(/\s+/g, '').toUpperCase();
-    if (!/^(RRULE:[\w=;,:+-/\\]+|daily|weekly|monthly|yearly)$/im.test(data.recurrence)) {
+    if (!/^(?:RRULE:[\w=;,:+\-/\\]+|daily|weekly|monthly|yearly)$/im.test(data.recurrence)) {
       data.recurrence = '!wrong rrule format!';
     } else {
       if (/^RRULE:/i.test(data.recurrence)) {
@@ -548,8 +547,7 @@ function atcb_decorate_data_description(data, i) {
     description = cleanDescription(description);
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^a-zA-Z0-9\-_.]/g, '');
-        // eslint-disable-next-line security/detect-non-literal-regexp
+        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
         description = description.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
       }
     }
@@ -608,10 +606,8 @@ function atcb_decorate_data_extend(data) {
     }
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^a-zA-Z0-9\-_.]/g, '');
-        // eslint-disable-next-line security/detect-non-literal-regexp
+        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
         data.dates[`${i}`].name = data.dates[`${i}`].name.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
-        // eslint-disable-next-line security/detect-non-literal-regexp
         data.dates[`${i}`].location = data.dates[`${i}`].location.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
       }
     }
@@ -630,7 +626,7 @@ function atcb_date_cleanup(dateTimeData) {
   }
   const endpoints = ['start', 'end'];
   endpoints.forEach(function (point) {
-    if (!/^(\d{4}-\d{2}-\d{2}T?(?:\d{2}:\d{2}|)Z?|today(?:\+\d{1,4}|))$/i.test(dateTimeData[point + 'Date'])) {
+    if (!/^(?:\d{4}-\d{2}-\d{2}T?(?:\d{2}:\d{2})?Z?|today(?:\+\d{1,4})?)$/i.test(dateTimeData[point + 'Date'])) {
       dateTimeData[point + 'Date'] = 'badly-formed';
     } else {
       dateTimeData[point + 'Date'] = atcb_date_calculation(dateTimeData[point + 'Date']);
@@ -835,7 +831,7 @@ async function atcb_validate_buttonStyle(data, msgPrefix) {
   if (!availableStyles.includes(data.buttonStyle)) {
     throw new Error(msgPrefix + ' failed: provided buttonStyle invalid');
   }
-  if (data.customCss && data.customCss !== '' && (!atcb_secure_url(data.customCss, false) || !/\.css($|\?)/.test(data.customCss))) {
+  if (data.customCss && data.customCss !== '' && (!atcb_secure_url(data.customCss, false) || !/\.css(?:$|\?)/.test(data.customCss))) {
     throw new Error(msgPrefix + ' failed: customCss provided, but no valid url');
   }
   if ((!data.customCss || data.customCss === '') && data.buttonStyle === 'custom') {
@@ -936,7 +932,7 @@ async function atcb_validate_attendee(data, msgPrefix, i, msgSuffix) {
   return true;
 }
 async function atcb_validate_uid(data, msgPrefix, i, msgSuffix) {
-  if (!/^(\w|-){1,254}$/.test(data.dates[`${i}`].uid)) {
+  if (!/^(?:\w|-){1,254}$/.test(data.dates[`${i}`].uid)) {
     if (data.debug) {
       console.warn(msgPrefix + ': UID not valid. May only contain alpha, digits, and dashes; and be less than 255 characters. Falling back to an automated value!' + msgSuffix);
     }
@@ -1005,7 +1001,7 @@ async function atcb_validate_rrule(data, msgPrefix) {
   if (data.recurrence && data.recurrence !== '' && data.dates.length > 1) {
     throw new Error(msgPrefix + ' failed: RRULE and multi-date set at the same time');
   }
-  if (data.recurrence && data.recurrence !== '' && !/^RRULE:[\w=;,:+-/\\]+$/i.test(data.recurrence)) {
+  if (data.recurrence && data.recurrence !== '' && !/^RRULE:[\w=;,:+\-/\\]+$/i.test(data.recurrence)) {
     throw new Error(msgPrefix + ' failed: RRULE data misspelled');
   }
   return true;
@@ -1014,22 +1010,22 @@ async function atcb_validate_rrule_simplyfied(data, msgPrefix) {
   if (data.recurrence_interval && (data.recurrence_interval < 1 || data.recurrence_interval % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_until && data.recurrence_until !== '' && !/^(\d|-|:)+$/i.test(data.recurrence_until)) {
+  if (data.recurrence_until && data.recurrence_until !== '' && !/^[\d\-:]+$/.test(data.recurrence_until)) {
     throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled');
   }
   if (data.recurrence_count && (data.recurrence_count < 1 || data.recurrence_count % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_byMonth && data.recurrence_byMonth !== '' && !/^(\d|,)+$/.test(data.recurrence_byMonth)) {
+  if (data.recurrence_byMonth && data.recurrence_byMonth !== '' && !/^[\d,]+$/.test(data.recurrence_byMonth)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byMonth) misspelled');
   }
-  if (data.recurrence_byMonthDay && data.recurrence_byMonthDay !== '' && !/^(\d|,)+$/.test(data.recurrence_byMonthDay)) {
+  if (data.recurrence_byMonthDay && data.recurrence_byMonthDay !== '' && !/^[\d,]+$/.test(data.recurrence_byMonthDay)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byMonthDay) misspelled');
   }
-  if (data.recurrence_byDay && data.recurrence_byDay !== '' && !/^(\d|-|MO|TU|WE|TH|FR|SA|SU|,)+$/im.test(data.recurrence_byDay)) {
+  if (data.recurrence_byDay && data.recurrence_byDay !== '' && !/^(?:[\d,-]|MO|TU|WE|TH|FR|SA|SU)+$/im.test(data.recurrence_byDay)) {
     throw new Error(msgPrefix + ' failed: recurrence data (byDay) misspelled');
   }
-  if (data.recurrence_weekstart && data.recurrence_weekstart !== '' && !/^(MO|TU|WE|TH|FR|SA|SU)$/im.test(data.recurrence_weekstart)) {
+  if (data.recurrence_weekstart && data.recurrence_weekstart !== '' && !/^(?:MO|TU|WE|TH|FR|SA|SU)$/im.test(data.recurrence_weekstart)) {
     throw new Error(msgPrefix + ' failed: recurrence data (weekstart) misspelled');
   }
   return true;
@@ -1540,7 +1536,8 @@ function atcb_create_atcbl(host, atList = true, returnEl = false, licenseNoteOnl
     }
   } else {
     atcbL.innerHTML = 'Using the <a href="https://add-to-calendar-pro.com" target="_blank" rel="noopener referrer">Add to Calendar Button</a>, licensed under the Elastic License 2.0 (ELv2).';
-    atcbL.setAttribute('style', 'none !important');
+    atcbL.setAttribute('style', 'display:none !important');
+    atcbL.classList.add('atcb-attribution');
     host.append(atcbL);
   }
   if (returnEl) return null;
@@ -2217,7 +2214,7 @@ function atcb_subscribe_ical(data, fileUrl) {
 function atcb_subscribe_google(data, fileUrl) {
   const baseUrl = 'https://calendar.google.com/calendar/r?cid=';
   const baseUrlApp = 'calendar.google.com/calendar?cid=';
-  const fileUrlRegex = /^(https?:\/\/|webcal:\/\/|\/\/)calendar\.google\.com\//;
+  const fileUrlRegex = /^(?:https?:\/\/|webcal:\/\/|\/\/)calendar\.google\.com\//;
   const newFileUrl = (function () {
     if (fileUrlRegex.test(fileUrl)) {
       return fileUrl.replace(/^(.)*\?cid=/, '');
@@ -2252,7 +2249,7 @@ function atcb_generate_google(data, date, subEvent = 'all') {
   urlParts.push('https://calendar.google.com/calendar/render?action=TEMPLATE');
   const formattedDate = atcb_generate_time(date, 'clean', 'google');
   urlParts.push('dates=' + encodeURIComponent(formattedDate.start) + '%2F' + encodeURIComponent(formattedDate.end));
-  if (date.timeZone && date.timeZone !== '' && !/(GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|WET)/i.test(date.timeZone) && !formattedDate.allday) {
+  if (date.timeZone && date.timeZone !== '' && !/GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|MET|MST|PST8PDT|WET/i.test(date.timeZone) && !formattedDate.allday) {
     urlParts.push('ctz=' + date.timeZone);
   }
   if (date.name && date.name !== '') {
@@ -2403,7 +2400,6 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
         return;
       }
     }
-    // eslint-disable-next-line security/detect-non-literal-fs-filename
     const newTab = window.open(url, target);
     if (newTab) {
       newTab.focus();
@@ -2625,7 +2621,7 @@ function atcb_generate_time(data, style = 'delimiters', targetCal = 'general', a
       }
       return durationHours + ':' + ('0' + durationMinutes).slice(-2);
     })();
-    if (targetCal == 'ical' || (targetCal == 'google' && !/(GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|WET)/i.test(data.timeZone))) {
+    if (targetCal == 'ical' || (targetCal == 'google' && !/GMT[+|-]\d{1,2}|Etc\/U|Etc\/Zulu|CET|CST6CDT|EET|EST|MET|MST|PST8PDT|WET/i.test(data.timeZone))) {
       return {
         start: atcb_format_datetime(newStartDate, 'clean', true, true),
         end: atcb_format_datetime(newEndDate, 'clean', true, true),
@@ -2947,7 +2943,7 @@ function atcb_secure_url(url, throwError = true) {
   }
 }
 function atcb_validEmail(email) {
-  if (!/^.{0,70}@.{1,30}\.[a-zA-Z]{2,9}$/.test(email)) {
+  if (!/^.{0,70}@.{1,30}\.[a-z]{2,9}$/i.test(email)) {
     return false;
   }
   return true;
@@ -2965,9 +2961,9 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     content = content.replace(/\{url\}(.+?)\{\/url\}/gi, (match, p1) => {
       return p1.split('|')[0];
     });
-    content = content.replace(/\[(|\/)(hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '');
-    content = content.replace(/\{(|\/)(hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '');
-    content = content.replace(/&[#a-zA-Z0-9]{1,9};/gi, '');
+    content = content.replace(/\[\/?(hr|[pbui]|strong|em|li|ul|ol|h\d)\]/gi, '');
+    content = content.replace(/\{\/?(hr|[pbui]|strong|em|li|ul|ol|h\d)\}/gi, '');
+    content = content.replace(/&[#a-z0-9]{1,9};/gi, '');
   } else {
     content = content.replace(/\[url\]((?:(?!\[\/url\]).)*)\[\/url\]/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
@@ -2975,8 +2971,8 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     content = content.replace(/\{url\}((?:(?!\[\/url\]).)*)\{\/url\}/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
     });
-    content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)(\s?\/?)\]/gi, '<$1$2$3>');
-    content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)(\s?\/?)\}/gi, '<$1$2$3>');
+    content = content.replace(/\[(\/)?(br|hr|[pbui]|strong|em|li|ul|ol|h\d)(\s?\/?)\]/gi, '<$1$2$3>');
+    content = content.replace(/\{(\/)?(br|hr|[pbui]|strong|em|li|ul|ol|h\d)(\s?\/?)\}/gi, '<$1$2$3>');
   }
   return content;
 }
@@ -4186,7 +4182,7 @@ if (atcbIsBrowser()) {
         this.data.identifier = this.identifier;
       } else {
         if (this.data.identifier && this.data.identifier !== '') {
-          if (!/^[\w\-_]+$/.test(this.data.identifier)) {
+          if (!/^[\w-]+$/.test(this.data.identifier)) {
             this.data.identifier = '';
             if (this.debug) {
               let prefix = 'Add to Calendar Button';
@@ -4384,7 +4380,7 @@ async function atcb_load_css(host, rootObj = null, data) {
     const cssGlobalContent = document.createElement('style');
     cssGlobalContent.id = 'atcb-global-style';
     const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth;
-    cssGlobalContent.innerText = '.atcb-modal-no-scroll{overflow-y:hidden !important;-webkit-overflow-scrolling:touch;} body.atcb-modal-no-scroll{padding-right:' + scrollBarWidth + 'px;}';
+    cssGlobalContent.innerText = '.atcb-modal-no-scroll{overflow-y:hidden !important;-webkit-overflow-scrolling:touch;} body.atcb-modal-no-scroll{padding-right:' + scrollBarWidth + 'px;}.atcb-attribution{display:none;}';
     if (nonceVal) {
       cssGlobalContent.setAttribute('nonce', nonceVal);
     }
@@ -4533,7 +4529,7 @@ async function atcb_action(inputData, triggerElement, keyboardTrigger = false) {
     if (triggerElement.id && triggerElement.id !== '') {
       data.identifier = triggerElement.id;
     } else {
-      if (data.identifier && data.identifier != '' && /^[\w\-_]+$/.test(data.identifier)) {
+      if (data.identifier && data.identifier != '' && /^[\w-]+$/.test(data.identifier)) {
         data.identifier = 'atcb-btn-' + data.identifier;
       } else {
         data.identifier = 'atcb-btn-custom';