> Fetch : fetch & merge official CardBook.xpi v76.4 :: [Rel.verUp 76.…

…4.1]

Source from .xpi release

[Release version Up - 76.4.1]

README.md

@@ -19,7 +19,7 @@ GitHub (main) - https://github.com/Gregory-K/CardBook.Alt.Icon
 GitLab (alt.) - https://gitlab.com/Gregory.K/CardBook.Alt.Icon
 
 Version:  
-**76.3.1**  
+**76.4.1**  
 Compatibility:  
 91.0a1 <= Thunderbird version >= 91.*
 

src/README.md

@@ -5,7 +5,7 @@ This is a **fork** of [**CardBook**](https://gitlab.com/CardBook/CardBook), a [T
 **CardBook Alt.Icon** simply provides an **alternative** main **icon** more aligned with Thunderbird's toolbar icon design.
 
 Version:  
-**76.3.1**  
+**76.4.1**  
 Icon Variation (sub-release):  
 %sub_release%  
 Compatibility:  

src/chrome/content/birthdays/cardbookBirthdaysUtils.js

@@ -324,7 +324,8 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) {
 			}
 		},
 
-		loadBirthdays: function (lnumberOfDays) {
+		loadBirthdays: function (aNumberOfDays) {
+			aNumberOfDays = (aNumberOfDays > 365) ? 365 : aNumberOfDays;
 			var myContact = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.addressBooksNameList");
 			var useOnlyEmail = cardbookRepository.cardbookPreferences.getBoolPref("extensions.cardbook.useOnlyEmail");
 			var search = {};
@@ -353,7 +354,7 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) {
 							var isDate = cardbookRepository.cardbookDates.convertDateStringToDateUTC(myFieldValue, dateFormat);
 							if (isDate != "WRONGDATE") {
 								listOfEmail = cardbookRepository.cardbookUtils.getMimeEmailsFromCards([myCard], useOnlyEmail);
-								cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myFieldValue, myCard.fn, lnumberOfDays, myFieldValue, listOfEmail, myDirPrefId, name, fieldType[field]);
+								cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myFieldValue, myCard.fn, aNumberOfDays, myFieldValue, listOfEmail, myDirPrefId, name, fieldType[field]);
 							} else {
 								cardbookRepository.cardbookUtils.formatStringForOutput("dateEntry1Wrong", [myDirPrefName, myCard.fn, myFieldValue, dateFormat], "Warning");
 							}
@@ -365,7 +366,7 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) {
 							var isDate = cardbookRepository.cardbookDates.convertDateStringToDateUTC(myEvents.result[j][0], dateFormat);
 							if (isDate != "WRONGDATE") {
 								listOfEmail = cardbookRepository.cardbookUtils.getMimeEmailsFromCards([myCard], useOnlyEmail);
-								cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myEvents.result[j][0], myCard.fn, lnumberOfDays, myEvents.result[j][0], listOfEmail, myDirPrefId, name, myEvents.result[j][1]);
+								cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myEvents.result[j][0], myCard.fn, aNumberOfDays, myEvents.result[j][0], listOfEmail, myDirPrefId, name, myEvents.result[j][1]);
 							} else {
 								cardbookRepository.cardbookUtils.formatStringForOutput("dateEntry1Wrong", [myDirPrefName, myCard.fn, myEvents.result[j][0], dateFormat], "Warning");
 							}

src/chrome/content/birthdays/wdw_birthdayList.js

@@ -147,6 +147,7 @@ if ("undefined" == typeof(wdw_birthdayList)) {
 			let noneFound = document.getElementById("noneFound");
 			let resulTable = document.getElementById("birthdayListTable");
 			let maxDaysUntilNextBirthday = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.numberOfDaysForSearching");
+			maxDaysUntilNextBirthday = (maxDaysUntilNextBirthday > 365) ? 365 : maxDaysUntilNextBirthday;
 
 			// if there are no birthdays in the configured timespan
 			if (cardbookBirthdaysUtils.lBirthdayList.length == 0) {
@@ -172,7 +173,7 @@ if ("undefined" == typeof(wdw_birthdayList)) {
 		},
 
 		displaySyncList: function() {
-			Services.wm.getMostRecentWindow("mail:3pane").openDialog("chrome://cardbook/content/birthdays/wdw_birthdaySync.xhtml", "", cardbookRepository.modalWindowParams);
+			Services.wm.getMostRecentWindow("mail:3pane").openDialog("chrome://cardbook/content/birthdays/wdw_birthdaySync.xhtml", "", cardbookRepository.windowParams);
 		},
 
 		buttonShowing: function () {

src/chrome/content/birthdays/wdw_birthdaySync.js

@@ -26,6 +26,7 @@ function do_refresh () {
 	let noneFound = document.getElementById("noneFound");
 	let resulTable = document.getElementById("syncListTable");
 	let maxDaysUntilNextBirthday = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.numberOfDaysForWriting");
+	maxDaysUntilNextBirthday = (maxDaysUntilNextBirthday > 365) ? 365 : maxDaysUntilNextBirthday;
 
 	// if there are no birthdays in the configured timespan
 	if (cardbookBirthdaysUtils.lBirthdayList.length == 0) {

src/chrome/content/cardbookInit.js

@@ -86,7 +86,7 @@ var cardbookInit = {
 		prefs.setCharPref("periodicPopupIime", "08:00");
 		prefs.setBoolPref("showPopupEvenIfNoBirthday", true);
 		prefs.setBoolPref("syncWithLightningOnStartup", false);
-		prefs.setCharPref("numberOfDaysForWriting", "366");
+		prefs.setCharPref("numberOfDaysForWriting", "365");
 		// localized
 		prefs.setCharPref("eventEntryTitle", cardbookRepository.extension.localeData.localizeMessage("eventEntryTitleMessage"));
 		prefs.setCharPref("calendarEntryCategories", cardbookRepository.extension.localeData.localizeMessage("anniversaryCategory"));
@@ -104,7 +104,7 @@ var cardbookInit = {
 		prefs.setCharPref("accountShown", "");
 		prefs.setCharPref("uncategorizedCards", "");
 		prefs.setCharPref("categoryColors", "");
-		prefs.setCharPref("addonVersion", "76.3.1");
+		prefs.setCharPref("addonVersion", "76.4.1");
 		prefs.setCharPref("defaultRegion", "NOTSET");
 
 		prefs.setBoolPref("localDataEncryption", false);

src/chrome/content/cardbookUtils.jsm

@@ -668,7 +668,7 @@ var cardbookUtils = {
 						}
 					}
 				};
-				let aImageConnection = {connPrefId: aDirPrefId, connUrl: aImageURI, connDescription: aDirname};
+				let aImageConnection = {connPrefId: aDirPrefId, connUrl: aImageURI, connDescription: aDirname, accessToken: "NOACCESSTOKEN"};
 				let request = new cardbookWebDAV(aImageConnection, listener_getimage);
 				cardbookRepository.cardbookUtils.formatStringForOutput("serverCardGettingImage", [aDirname, aCardName]);
 				request.getimage();

src/chrome/content/configuration/wdw_cardbookConfiguration.xhtml

@@ -805,7 +805,7 @@
 										accesskey="__MSG_numberOfDaysForSearchingAccesskey__"
 										control="numberOfDaysForSearchingTextBox"
 										id="numberOfDaysForSearchingLabel"/>
-									<html:input id="numberOfDaysForSearchingTextBox" type="number" min="1" max="3000" class="size4"
+									<html:input id="numberOfDaysForSearchingTextBox" type="number" min="1" max="365" class="size4"
 										preference="extensions.cardbook.numberOfDaysForSearching" instantApply="true"/>
 								</hbox>
 								<hbox align="center">
@@ -840,7 +840,7 @@
 										accesskey="__MSG_numberOfDaysForWritingAccesskey__"
 										control="numberOfDaysForWritingTextBox"
 										id="numberOfDaysForWritingLabel"/>
-									<html:input id="numberOfDaysForWritingTextBox" type="number" min="1" max="3000" class="size4"
+									<html:input id="numberOfDaysForWritingTextBox" type="number" min="1" max="365" class="size4"
 										preference="extensions.cardbook.numberOfDaysForWriting" instantApply="true"/>
 								</hbox>
 								<hbox align="center">

src/manifest.json

@@ -1,6 +1,6 @@
 {
 	"name": "__MSG_extName__ Alt.Icon",
-	"version": "76.3.1",
+	"version": "76.4.1",
 	"description": "__MSG_extDesc__ -- An alternative icon version/fork (**CAUTION**: visit 'Homepage' bellow). --",
 	"homepage_url": "https://github.com/Gregory-K/CardBook.Alt.Icon",
 	"author": "Philippe VIGNEAU",

version.txt

@@ -1 +1 @@
-76.3.1
+76.4.1