From 032fa8c7369458a39c5bace55e452a309eaed718 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Wed, 22 Jul 2020 14:55:40 +0200
Subject: [PATCH] http:// to https://

---
 .../v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php   |  2 +-
 .../RainLoop/Providers/AddressBook/PdoAddressBook.php  | 10 +---------
 .../app/templates/Views/Admin/AdminSettingsAbout.html  |  8 ++++----
 .../0.0.0/app/templates/Views/User/PopupsContacts.html |  2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php
index cfecbc55e..2d1e805bf 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php
@@ -112,7 +112,7 @@ class LinkFinder
 			$sNameLink = $sLink;
 			if (!\preg_match('/^[a-z]{3,5}\:\/\//i', \ltrim($sLink)))
 			{
-				$sLink = 'http://'.\ltrim($sLink);
+				$sLink = 'https://'.\ltrim($sLink);
 			}
 
 			return '<a '.($bAddTargetBlank ? 'target="_blank" ': '').'href="'.$sLink.'">'.$sNameLink.'</a>';
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 982f0bdbd..5acf4a742 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -482,15 +482,7 @@ class PdoAddressBook
 			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
 			$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
 			$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
-
-			if (\preg_match('/^(google\.|dav\.fruux\.com|contacts\.icloud\.com)/i', $sUrl))
-			{
-				$sUrl = 'https://'.$sUrl;
-			}
-			else
-			{
-				$sUrl = 'http://'.$sUrl;
-			}
+			$sUrl = 'https://'.$sUrl;
 		}
 
 		$aUrl = \parse_url($sUrl);
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 1a5287a59..10359d211 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -5,9 +5,9 @@
 			<div class="span4">
 				<div class="rl-logo"></div>
 				<div style="margin-left: 30px;">
-					2019 &copy; <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
+					2020 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
 					<br />
-					<a class="g-ui-link" href="http://www.rainloop.net/" target="_blank" style="padding-left: 0">http://rainloop.net/</a>
+					<a class="g-ui-link" href="https://www.rainloop.net/" target="_blank" style="padding-left: 0">https://rainloop.net/</a>
 				</div>
 			</div>
 			<div class="rl-desc" style="float: left">
@@ -65,12 +65,12 @@
 					<div data-bind="visible: 'updating' === statusType()">
 						<i class="icon-spinner animated"></i>
 						&nbsp;&nbsp;
-						<span data-i18n="TAB_ABOUT/LABEL_UPDATING"></span>&hellip;
+						<span data-i18n="TAB_ABOUT/LABEL_UPDATING"></span>…
 					</div>
 					<div data-bind="visible: 'checking' === statusType()">
 						<i class="icon-spinner animated"></i>
 						&nbsp;&nbsp;
-						<span data-i18n="TAB_ABOUT/LABEL_CHECKING"></span>&hellip;
+						<span data-i18n="TAB_ABOUT/LABEL_CHECKING"></span>…
 					</div>
 				</h5>
 			</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index 6b0c3ff4c..56daa2549 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -245,7 +245,7 @@
 										<div data-bind="foreach: viewPropertiesWeb">
 											<div class="property-line">
 												<span class="contactValueLargeStatic" data-bind="text: value"></span>
-												<input type="text" class="contactValueInputLarge" placeholder="http://"
+												<input type="text" class="contactValueInputLarge" placeholder="https://"
 													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
 											</div>