From acf19e512831eb4e399f29c19975c21341d64549 Mon Sep 17 00:00:00 2001
From: Baleshevich Srdjan <37658865+BaleshSrle@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:30:59 +0100
Subject: [PATCH] Added CalDAV & CardDAV settings & update scope

* Added CalDAV & CardDAV settings for Aol.com , Bell.met , GMX.com , GMX.net , Mail.com , Web.de & Yahoo.com

* Updated the scope subtag  on Yahoo.com oAuth tag
---
 ispdb/aol.com.xml   | 14 +++++++++++++-
 ispdb/bell.net.xml  | 10 ++++++++++
 ispdb/gmx.com.xml   | 10 ++++++++++
 ispdb/gmx.net.xml   | 10 ++++++++++
 ispdb/mail.com.xml  | 10 ++++++++++
 ispdb/web.de.xml    | 10 ++++++++++
 ispdb/yahoo.com.xml | 14 +++++++++++++-
 7 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/ispdb/aol.com.xml b/ispdb/aol.com.xml
index 4f92a15..7670cd5 100644
--- a/ispdb/aol.com.xml
+++ b/ispdb/aol.com.xml
@@ -57,9 +57,21 @@
     </documentation>
   </emailProvider>
 
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>OAuth2</authentication>
+    <serverURL>https://caldav.aol.com</serverURL>
+  </calendar>
+
+  <calendar type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>OAuth2</authentication>
+    <serverURL>https://carddav.aol.com</serverURL>
+  </calendar>
+
   <oAuth2>
     <issuer>login.aol.com</issuer>
-    <scope>mail-w</scope>
+    <scope>mail-w sdct-w ycal-r ycal-w</scope>
     <authURL>https://api.login.aol.com/oauth2/request_auth</authURL>
     <tokenURL>https://api.login.aol.com/oauth2/get_token</tokenURL>
   </oAuth2>
diff --git a/ispdb/bell.net.xml b/ispdb/bell.net.xml
index f4f2e1e..6f2baa1 100644
--- a/ispdb/bell.net.xml
+++ b/ispdb/bell.net.xml
@@ -27,4 +27,14 @@
       <username>%EMAILADDRESS%</username>
     </outgoingServer>
   </emailProvider>
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://dav.webmail.bell.net</serverURL>
+  </calendar>
+  <addressBook type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://dav.webmail.bell.net</serverURL>
+  </addressBook>
 </clientConfig>
diff --git a/ispdb/gmx.com.xml b/ispdb/gmx.com.xml
index 6c2809f..3936a16 100644
--- a/ispdb/gmx.com.xml
+++ b/ispdb/gmx.com.xml
@@ -69,4 +69,14 @@
       <authentication>password-cleartext</authentication>
     </outgoingServer>
   </emailProvider>
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://caldav.gmx.com/</serverURL>
+  </calendar>
+  <addressBook type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://carddav.gmx.com/</serverURL>
+  </addressBook>
 </clientConfig>
diff --git a/ispdb/gmx.net.xml b/ispdb/gmx.net.xml
index af4638e..ca9c100 100644
--- a/ispdb/gmx.net.xml
+++ b/ispdb/gmx.net.xml
@@ -68,6 +68,16 @@
       <instruction lang="de">Sie müssen einmalig den Zugriff über POP3 &amp; IMAP in den E-Mail-Einstellungen Ihres Kontos erlauben!</instruction>
     </enable>
   </emailProvider>
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://caldav.gmx.net/</serverURL>
+  </calendar>
+  <addressBook type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://carddav.gmx.net/</serverURL>
+  </addressBook>
 </clientConfig>
 <!-- A whole lot of vanity domains, which we will not add here (yay MX lookup):
      bist-eine-haelfte-von-mir.de,  bleib-bei-mir.de,  es-ist-liebe.de,  fahr-zur-hoelle.org,  ich-bin-verrueckt-nach-dir.de,  ist-allein.info,  ist-es-liebe.de,  ist-ganz-allein.de,  ist-willig.de,  lass-es-geschehen.de,  liebt-dich.info,  loveyouforever.de,  moechte-mit-dir-aufwachen.de,  schmusemail.de,  schreib-doch-mal-wieder.de,  teilt-mit-dir-alle-geheimnisse.de,  verlass-mich-nicht.de,  vorsicht-scharf.de,  weinenvorglueck.de,  alphafrau.de,  feinripptraeger.de,  fettabernett.de,  ist-einmalig.de,  kaffeeschluerfer.com,  liebt-den-mann-ihrer-chefin.de,  liebt-die-frau-seines-chefs.de,  maennerversteherin.com,  partybombe.de,  partyheld.de,  polizisten-duzer.de,  raubtierbaendiger.de,  saeuferleber.de,  tortenboxer.de,  turboprinz.de,  turboprinzessin.de,  vorsicht-bissig.de,  alpenjodel.de,  das-spiel-hat-90-minuten.de,  der-ball-ist-rund.net,  die-genossen.de,  die-optimisten.net,  email-ausdrucker.de,  fantasymail.de,  freudenkinder.de,  gentlemansclub.de,  gmx-ist-cool.de,  herr-der-mails.de,  ich-habe-fertig.com,  meine-wahrheit-deine-wahrheit.de,  muskelshirt.de,  quantentunnel.de,  sags-per-mail.de,  sonnenkinder.org,  turnbeutel-vergesser.com,  vollbio.de,  volloeko.de,  vorabend-einchecker.de,  weibsvolk.org,  wenns-um-email-geht.de,  wir-sind-cool.org,  wolke7.net,  abwesend.de,  baldmama.de,  baldpapa.de,  betriebsdirektor.de,  buerotiger.de,  habmalnefrage.de,  hab-verschlafen.de,  ich-will-net.de,  kommespaeter.de,  mailueberfall.de,  netterchef.de,  nurfuerspam.de,  streber24.de,  terminverpennt.de,  unterderbruecke.de,  will-hier-weg.de,  wir-haben-nachwuchs.de,  women-at-work.org,  bin-wieder-da.de,  coole-files.de,  die-besten-bilder.de,  digi-dia-freakshow.de,  digital-filestore.de,  digitalfoto-model-award.de,  download-privat.de,  gmx-topmail.de,  meine-dateien.info,  meine-diashow.de,  meine-fotos.info,  meine-urlaubsfotos.de,  neue-dateien.de,  office-dateien.de,  peinliche-fotos.de,  public-files.de,  shared-files.de,  topmail-files.de,  war-im-urlaub.de
diff --git a/ispdb/mail.com.xml b/ispdb/mail.com.xml
index de1c346..18a5e5a 100644
--- a/ispdb/mail.com.xml
+++ b/ispdb/mail.com.xml
@@ -245,4 +245,14 @@
       <authentication>password-cleartext</authentication>
     </outgoingServer>
   </emailProvider>
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://caldav.mail.com/</serverURL>
+  </calendar>
+  <addressBook type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://carddav.mail.com/</serverURL>
+  </addressBook>
 </clientConfig>
diff --git a/ispdb/web.de.xml b/ispdb/web.de.xml
index 45d4db9..44f2480 100644
--- a/ispdb/web.de.xml
+++ b/ispdb/web.de.xml
@@ -64,4 +64,14 @@
       <instruction lang="de">Sie müssen einmalig den Zugriff über POP3 &amp; IMAP in den E-Mail-Einstellungen Ihres Kontos erlauben!</instruction>
     </enable>
   </emailProvider>
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://caldav.web.de/</serverURL>
+  </calendar>
+  <addressBook type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>http-basic</authentication>
+    <serverURL>https://carddav.web.de/</serverURL>
+  </addressBook>
 </clientConfig>
diff --git a/ispdb/yahoo.com.xml b/ispdb/yahoo.com.xml
index 4712f98..4026287 100644
--- a/ispdb/yahoo.com.xml
+++ b/ispdb/yahoo.com.xml
@@ -66,9 +66,21 @@
     </documentation>
   </emailProvider>
 
+  <calendar type="caldav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>OAuth2</authentication>
+    <serverURL>https://caldav.calendar.yahoo.com</serverURL>
+  </calendar>
+
+  <calendar type="carddav">
+    <username>%EMAILADDRESS%</username>
+    <authentication>OAuth2</authentication>
+    <serverURL>https://carddav.address.yahoo.com/</serverURL>
+  </calendar>
+
   <oAuth2>
     <issuer>login.yahoo.com</issuer>
-    <scope>mail-w</scope>
+    <scope>mail-w sdct-w ycal-r ycal-w</scope>
     <authURL>https://api.login.yahoo.com/oauth2/request_auth</authURL>
     <tokenURL>https://api.login.yahoo.com/oauth2/get_token</tokenURL>
   </oAuth2>