add-to-calendar-button 2.6.17 → 2.6.19

package/.eslintrc.json

@@ -22,7 +22,7 @@
     ]
   },
 
-  "extends": ["plugin:@typescript-eslint/recommended", "eslint:recommended", "plugin:security/recommended-legacy", "plugin:prettier/recommended"],
+  "extends": ["plugin:@typescript-eslint/recommended", "eslint:recommended", "plugin:security/recommended-legacy", "plugin:prettier/recommended", "plugin:wc/recommended"],
 
   "plugins": ["@typescript-eslint", "prettier"],
 

package/assets/css/atcb-3d.css

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb-date.css

@@ -5,7 +5,7 @@
  *
  * Style: Date
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb-flat.css

@@ -5,7 +5,7 @@
  *
  * Style: Flat
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb-neumorphism.css

@@ -5,7 +5,7 @@
  *
  * Style: Neumorphism
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb-round.css

@@ -5,7 +5,7 @@
  *
  * Style: Round
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb-text.css

@@ -5,7 +5,7 @@
  *
  * Style: Text
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/assets/css/atcb.css

@@ -5,7 +5,7 @@
  *
  * Style: Default
  *
- * Version: 2.6.17
+ * Version: 2.6.19
  * 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)

package/dist/atcb-no-pro-unstyle.js

@@ -5,14 +5,14 @@
  * Add to Calendar TimeZones iCal Library
  * ++++++++++++++++++++++++++++++++++++++
  *
- * Version: 1.8.2
+ * Version: 1.8.3
  * Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/add2cal/timezones-ical-library
  * License: Apache-2.0
  *
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const tzlibVersion = '1.8.2';
+const tzlibVersion = '1.8.3';
 const tzlibZonesDB = {
   Zulu: ['Etc/UTC', 0],
   WET: ['', 1],
@@ -974,14 +974,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.17
+ *  Version: 2.6.19
  *  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.17';
+const atcbVersion = '2.6.19';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -1072,7 +1072,7 @@ const atcbAndroidInvalidOptions = ['apple'];
 const atcbStates = [];
 const atcbWcParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'identifier',
   'name',
@@ -1149,7 +1149,7 @@ const atcbWcParams = [
 ];
 const atcbWcProParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'attendee',
   'images',
@@ -1176,7 +1176,7 @@ const atcbWcProParams = [
 ];
 const atcbWcBooleanParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'useUserTZ',
   'hideIconButton',
   'hideIconList',
@@ -1647,7 +1647,7 @@ function atcb_date_specials_calculation(type, dateString, timeString = null, tim
     }
     const currentUtcDate = new Date().toISOString();
     return tmpDate.getTime() < new Date(currentUtcDate).getTime();
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -1668,7 +1668,7 @@ function atcb_date_calculation(dateString) {
   }
   try {
     return newDate.toISOString().replace(/T(\d{2}:\d{2}:\d{2}\.\d{3})Z/g, '');
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -3355,7 +3355,7 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
         }
         return '';
       })();
-      url = (data.dev ? 'https://dev.caldn.net/' : 'https://go.caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
+      url = (data.dev ? 'https://dev.caldn.net/' : 'https://caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
       if (!atcb_secure_url(url)) {
         return;
       }
@@ -3387,7 +3387,8 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     return '';
   })();
   if (data.proxy) {
-    atcb_open_cal_url(data, 'ical', 'https://add-to-calendar-pro.com', false, subEvent);
+    const langUrlPart = data.language && data.language === 'de' ? data.language + '/' : '';
+    atcb_open_cal_url(data, 'ical', 'https://caldn.net/' + langUrlPart + 'no-ics-file', false, subEvent);
     return;
   }
   if (givenIcsFile !== '' && (!atcbIsiOS() || !atcbIsWebView() || data.bypassWebViewCheck)) {
@@ -3925,10 +3926,10 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     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, '');
   } else {
-    content = content.replace(/\[url\]((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\[\/url\]/gi, function (match, p1) {
+    content = content.replace(/\[url\]((?:(?!\[\/url\]).)*)\[\/url\]/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
     });
-    content = content.replace(/\{url\}((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\{\/url\}/gi, function (match, p1) {
+    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>');
@@ -5078,7 +5079,7 @@ if (atcbIsBrowser()) {
       }
     }
     static get observedAttributes() {
-      const observeAdditionally = ['instance', 'prokey', 'proKey'];
+      const observeAdditionally = ['instance', 'prokey', 'proKey', 'prooverride', 'proOverride'];
       if (this.proKey && this.proKey !== '') {
         return atcbWcProParams
           .map((element) => {
@@ -5163,9 +5164,7 @@ if (atcbIsBrowser()) {
       this.setAttribute('atcb-button-id', this.data.identifier);
       this.classList.add('add-to-calendar');
       try {
-        this.style.visibility = 'visible';
-        this.style.opacity = '1';
-        this.style.position = 'relative';
+        this.setAttribute('style', 'visibility:visible;opacity:1;position:relative;outline:none !important;');
         await atcb_build_button(this.shadowRoot, this.data);
         return true;
       } catch (e) {
@@ -5186,7 +5185,7 @@ async function atcb_process_inline_data(el, debug = false) {
   try {
     data = atcb_read_attributes(el);
     await atcb_check_required(data);
-  } catch (e) {
+  } catch {
     const slotInput = el.innerHTML.trim();
     if (!slotInput) {
       throw new Error('Add to Calendar Button generation failed: No data provided.');
@@ -5613,7 +5612,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         }
         if (proOverride) {
           atcbWcParams.forEach((key) => {
-            if (Object.prototype.hasOwnProperty.call(dataOverrides, key)) {
+            if (Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'hidebranding', 'rsvp', 'ty'].indexOf(key) === -1) {
               data[`${key}`] = dataOverrides[`${key}`];
             }
           });
@@ -5629,7 +5628,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         return data;
       }
       throw new Error('Not possible to read proKey config from server...');
-    } catch (e) {
+    } catch {
       console.error('Add to Calendar Button proKey invalid or server not responding! Falling back to local data...');
     }
   }

package/dist/atcb-no-pro.js

@@ -5,14 +5,14 @@
  * Add to Calendar TimeZones iCal Library
  * ++++++++++++++++++++++++++++++++++++++
  *
- * Version: 1.8.2
+ * Version: 1.8.3
  * Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/add2cal/timezones-ical-library
  * License: Apache-2.0
  *
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const tzlibVersion = '1.8.2';
+const tzlibVersion = '1.8.3';
 const tzlibZonesDB = {
   Zulu: ['Etc/UTC', 0],
   WET: ['', 1],
@@ -974,14 +974,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.17
+ *  Version: 2.6.19
  *  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.17';
+const atcbVersion = '2.6.19';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -1071,7 +1071,7 @@ const atcbAndroidInvalidOptions = ['apple'];
 const atcbStates = [];
 const atcbWcParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'identifier',
   'name',
@@ -1148,7 +1148,7 @@ const atcbWcParams = [
 ];
 const atcbWcProParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'attendee',
   'images',
@@ -1175,7 +1175,7 @@ const atcbWcProParams = [
 ];
 const atcbWcBooleanParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'useUserTZ',
   'hideIconButton',
   'hideIconList',
@@ -1646,7 +1646,7 @@ function atcb_date_specials_calculation(type, dateString, timeString = null, tim
     }
     const currentUtcDate = new Date().toISOString();
     return tmpDate.getTime() < new Date(currentUtcDate).getTime();
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -1667,7 +1667,7 @@ function atcb_date_calculation(dateString) {
   }
   try {
     return newDate.toISOString().replace(/T(\d{2}:\d{2}:\d{2}\.\d{3})Z/g, '');
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -3354,7 +3354,7 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
         }
         return '';
       })();
-      url = (data.dev ? 'https://dev.caldn.net/' : 'https://go.caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
+      url = (data.dev ? 'https://dev.caldn.net/' : 'https://caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
       if (!atcb_secure_url(url)) {
         return;
       }
@@ -3386,7 +3386,8 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     return '';
   })();
   if (data.proxy) {
-    atcb_open_cal_url(data, 'ical', 'https://add-to-calendar-pro.com', false, subEvent);
+    const langUrlPart = data.language && data.language === 'de' ? data.language + '/' : '';
+    atcb_open_cal_url(data, 'ical', 'https://caldn.net/' + langUrlPart + 'no-ics-file', false, subEvent);
     return;
   }
   if (givenIcsFile !== '' && (!atcbIsiOS() || !atcbIsWebView() || data.bypassWebViewCheck)) {
@@ -3924,10 +3925,10 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     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, '');
   } else {
-    content = content.replace(/\[url\]((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\[\/url\]/gi, function (match, p1) {
+    content = content.replace(/\[url\]((?:(?!\[\/url\]).)*)\[\/url\]/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
     });
-    content = content.replace(/\{url\}((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\{\/url\}/gi, function (match, p1) {
+    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>');
@@ -5077,7 +5078,7 @@ if (atcbIsBrowser()) {
       }
     }
     static get observedAttributes() {
-      const observeAdditionally = ['instance', 'prokey', 'proKey'];
+      const observeAdditionally = ['instance', 'prokey', 'proKey', 'prooverride', 'proOverride'];
       if (this.proKey && this.proKey !== '') {
         return atcbWcProParams
           .map((element) => {
@@ -5162,9 +5163,7 @@ if (atcbIsBrowser()) {
       this.setAttribute('atcb-button-id', this.data.identifier);
       this.classList.add('add-to-calendar');
       try {
-        this.style.visibility = 'visible';
-        this.style.opacity = '1';
-        this.style.position = 'relative';
+        this.setAttribute('style', 'visibility:visible;opacity:1;position:relative;outline:none !important;');
         await atcb_build_button(this.shadowRoot, this.data);
         return true;
       } catch (e) {
@@ -5185,7 +5184,7 @@ async function atcb_process_inline_data(el, debug = false) {
   try {
     data = atcb_read_attributes(el);
     await atcb_check_required(data);
-  } catch (e) {
+  } catch {
     const slotInput = el.innerHTML.trim();
     if (!slotInput) {
       throw new Error('Add to Calendar Button generation failed: No data provided.');
@@ -5612,7 +5611,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         }
         if (proOverride) {
           atcbWcParams.forEach((key) => {
-            if (Object.prototype.hasOwnProperty.call(dataOverrides, key)) {
+            if (Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'hidebranding', 'rsvp', 'ty'].indexOf(key) === -1) {
               data[`${key}`] = dataOverrides[`${key}`];
             }
           });
@@ -5628,7 +5627,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         return data;
       }
       throw new Error('Not possible to read proKey config from server...');
-    } catch (e) {
+    } catch {
       console.error('Add to Calendar Button proKey invalid or server not responding! Falling back to local data...');
     }
   }

package/dist/atcb-unstyle.js

@@ -5,14 +5,14 @@
  * Add to Calendar TimeZones iCal Library
  * ++++++++++++++++++++++++++++++++++++++
  *
- * Version: 1.8.2
+ * Version: 1.8.3
  * Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/add2cal/timezones-ical-library
  * License: Apache-2.0
  *
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const tzlibVersion = '1.8.2';
+const tzlibVersion = '1.8.3';
 const tzlibZonesDB = {
   Zulu: ['Etc/UTC', 0],
   WET: ['', 1],
@@ -974,14 +974,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.17
+ *  Version: 2.6.19
  *  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.17';
+const atcbVersion = '2.6.19';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -1072,7 +1072,7 @@ const atcbAndroidInvalidOptions = ['apple'];
 const atcbStates = [];
 const atcbWcParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'identifier',
   'name',
@@ -1149,7 +1149,7 @@ const atcbWcParams = [
 ];
 const atcbWcProParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'cspnonce',
   'attendee',
   'images',
@@ -1176,7 +1176,7 @@ const atcbWcProParams = [
 ];
 const atcbWcBooleanParams = [
   'debug',
-  'prooOverride',
+  'proOverride',
   'useUserTZ',
   'hideIconButton',
   'hideIconList',
@@ -1647,7 +1647,7 @@ function atcb_date_specials_calculation(type, dateString, timeString = null, tim
     }
     const currentUtcDate = new Date().toISOString();
     return tmpDate.getTime() < new Date(currentUtcDate).getTime();
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -1668,7 +1668,7 @@ function atcb_date_calculation(dateString) {
   }
   try {
     return newDate.toISOString().replace(/T(\d{2}:\d{2}:\d{2}\.\d{3})Z/g, '');
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -2237,7 +2237,7 @@ async function atcb_generate_ty(hostEl, dataObj) {
             header.atcb = true;
           }
           tyData.fields = tyData.fields.filter((field) => field.name !== 'header');
-        } catch (e) {
+        } catch {
           /* do nothing */
         }
       }
@@ -2425,13 +2425,23 @@ async function atcb_generate_rsvp_form(host, data, hostEl, keyboardTrigger = fal
       }
       return attendeeParts[0];
     }
-    return '';
+    return null;
   })();
-  if (attendee !== '') {
-    hiddenContent += '<input type="hidden" name="' + staticID + '-email" id="' + data.identifier + '-rsvp-email" value="' + attendee + '" />';
+  const customEmailField = rsvpData.fields?.find((field) => field.name === 'email');
+  if (!customEmailField) {
+    if (attendee) {
+      hiddenContent += '<input type="hidden" name="email" id="' + data.identifier + '-rsvp-email" value="' + attendee + '" />';
+    } else {
+      rsvpContent += '<div class="pro-field"><label for="' + data.identifier + '-rsvp-email">' + atcb_translate_hook('form.email', data) + '<span>*</span></label>';
+      rsvpContent += '<input type="email" name="email" id="' + data.identifier + '-rsvp-email" ' + (data.disabled && 'disabled') + ' aria-label="' + atcb_translate_hook('form.email', data) + '" value="" /></div>';
+    }
   } else {
-    rsvpContent += '<div class="pro-field"><label for="' + data.identifier + '-rsvp-email">' + atcb_translate_hook('form.email', data) + '<span>*</span></label>';
-    rsvpContent += '<input type="email" name="' + staticID + '-email" id="' + data.identifier + '-rsvp-email" ' + (data.disabled && 'disabled') + ' aria-label="' + atcb_translate_hook('form.email', data) + '" value="" /></div>';
+    rsvpData.fields = rsvpData.fields.map((field) => {
+      if (field.name === 'email') {
+        return { ...field, required: true, type: 'email', default: attendee !== '' && attendee || field.default };
+      }
+      return field;
+    });
   }
   if (rsvpData.fields && rsvpData.fields.length > 0) {
     const customForm = atcb_build_form(rsvpData.fields, data.identifier + '-rsvp', data.disabled);
@@ -2531,10 +2541,8 @@ async function atcb_generate_rsvp_form(host, data, hostEl, keyboardTrigger = fal
       e.preventDefault();
       rsvpFormSubmitting.style.display = 'block';
       rsvpFormSubmit.style.display = 'none';
-      const staticFields = [
-        { type: 'email', name: data.proKey + '-email', fieldId: data.identifier + '-rsvp-email', required: true },
-        { type: 'number', name: data.proKey + '-amount', fieldId: data.identifier + '-rsvp-amount', required: true },
-      ];
+      const staticFields = [{ type: 'number', name: data.proKey + '-amount', fieldId: data.identifier + '-rsvp-amount', required: true }];
+      if (!customEmailField) staticFields.push({ type: 'email', name: 'email', fieldId: data.identifier + '-rsvp-email', required: true });
       let valid = atcb_validate_form(rsvpHost, [...staticFields, ...rsvpData.fields]);
       const amountEl = rsvpHost.getElementById(data.identifier + '-rsvp-amount');
       const amount = parseInt(amountEl.value) || 1;
@@ -2554,17 +2562,24 @@ async function atcb_generate_rsvp_form(host, data, hostEl, keyboardTrigger = fal
           if (closeBtn) closeBtn.style.display = 'block';
           return;
         }
+        let fieldsCopy = JSON.parse(JSON.stringify(rsvpData.fields));
         const bodyData = [];
         bodyData.push({ name: 'prokey', value: data.proKey });
         bodyData.push({ name: 'language', value: data.language });
         const statusValEl = rsvpHost.querySelector('[name="' + data.proKey + '-status"]:checked');
         bodyData.push({ name: 'status', value: statusValEl ? statusValEl.value : 'confirmed' });
         bodyData.push({ name: 'amount', value: amount });
-        bodyData.push({ name: 'email', value: rsvpHost.getElementById(data.identifier + '-rsvp-email').value });
+        if (!customEmailField) {
+          bodyData.push({ name: 'email', value: rsvpHost.getElementById(data.identifier + '-rsvp-email').value });
+        } else {
+          const emailFieldId = fieldsCopy.find((field) => field.name === 'email')?.fieldId;
+          bodyData.push({ name: 'email', value: rsvpHost.getElementById(emailFieldId).value });
+          fieldsCopy = fieldsCopy.filter((field) => field.fieldId !== emailFieldId);
+        }
         if (data.dev) bodyData.push({ name: 'dev', value: true });
         const bodyData_payload = {};
         let skipRadio = false;
-        rsvpData.fields.forEach((field) => {
+        fieldsCopy.forEach((field) => {
           if (field.type !== 'label') {
             if (field.type === 'radio') {
               if (!skipRadio) {
@@ -2756,7 +2771,7 @@ function atcb_build_form(fields, identifier = '', disabled = false) {
 }
 function atcb_create_field_html(type, name, fieldLabel, fieldId, required = false, fieldValue, defaultVal = null, fieldPlaceholder = '', disabled = false) {
   let fieldHtml = '';
-  if ((type === 'text' || type === 'number') && (fieldLabel !== '' || required)) {
+  if ((type === 'text' || type === 'email' || type === 'number') && fieldLabel !== '') {
     fieldHtml += '<label for="' + fieldId + '">' + fieldLabel + (required ? '<span>*</span>' : '') + '</label>';
   }
   fieldHtml +=
@@ -4061,7 +4076,7 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
         }
         return '';
       })();
-      url = (data.dev ? 'https://dev.caldn.net/' : 'https://go.caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
+      url = (data.dev ? 'https://dev.caldn.net/' : 'https://caldn.net/') + data.proKey + '/' + urlType + '/' + type + query;
       if (!atcb_secure_url(url)) {
         return;
       }
@@ -4093,7 +4108,8 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     return '';
   })();
   if (data.proxy) {
-    atcb_open_cal_url(data, 'ical', 'https://add-to-calendar-pro.com', false, subEvent);
+    const langUrlPart = data.language && data.language === 'de' ? data.language + '/' : '';
+    atcb_open_cal_url(data, 'ical', 'https://caldn.net/' + langUrlPart + 'no-ics-file', false, subEvent);
     return;
   }
   if (givenIcsFile !== '' && (!atcbIsiOS() || !atcbIsWebView() || data.bypassWebViewCheck)) {
@@ -4631,10 +4647,10 @@ function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false)
     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, '');
   } else {
-    content = content.replace(/\[url\]((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\[\/url\]/gi, function (match, p1) {
+    content = content.replace(/\[url\]((?:(?!\[\/url\]).)*)\[\/url\]/gi, function (match, p1) {
       return atcb_parse_url_code(p1);
     });
-    content = content.replace(/\{url\}((?:(?!\[\/url\])[\w&$+.,:;=~!*'?@^%#|\s\-()[\]/])*)\{\/url\}/gi, function (match, p1) {
+    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>');
@@ -5784,7 +5800,7 @@ if (atcbIsBrowser()) {
       }
     }
     static get observedAttributes() {
-      const observeAdditionally = ['instance', 'prokey', 'proKey'];
+      const observeAdditionally = ['instance', 'prokey', 'proKey', 'prooverride', 'proOverride'];
       if (this.proKey && this.proKey !== '') {
         return atcbWcProParams
           .map((element) => {
@@ -5869,9 +5885,7 @@ if (atcbIsBrowser()) {
       this.setAttribute('atcb-button-id', this.data.identifier);
       this.classList.add('add-to-calendar');
       try {
-        this.style.visibility = 'visible';
-        this.style.opacity = '1';
-        this.style.position = 'relative';
+        this.setAttribute('style', 'visibility:visible;opacity:1;position:relative;outline:none !important;');
         await atcb_build_button(this.shadowRoot, this.data);
         return true;
       } catch (e) {
@@ -5892,7 +5906,7 @@ async function atcb_process_inline_data(el, debug = false) {
   try {
     data = atcb_read_attributes(el);
     await atcb_check_required(data);
-  } catch (e) {
+  } catch {
     const slotInput = el.innerHTML.trim();
     if (!slotInput) {
       throw new Error('Add to Calendar Button generation failed: No data provided.');
@@ -6319,7 +6333,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         }
         if (proOverride) {
           atcbWcParams.forEach((key) => {
-            if (Object.prototype.hasOwnProperty.call(dataOverrides, key)) {
+            if (Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'hidebranding', 'rsvp', 'ty'].indexOf(key) === -1) {
               data[`${key}`] = dataOverrides[`${key}`];
             }
           });
@@ -6335,7 +6349,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         return data;
       }
       throw new Error('Not possible to read proKey config from server...');
-    } catch (e) {
+    } catch {
       console.error('Add to Calendar Button proKey invalid or server not responding! Falling back to local data...');
     }
   }