http:// to https://

This commit is contained in:
djmaze 2020-07-22 14:55:40 +02:00
parent 749f372042
commit 032fa8c736
4 changed files with 7 additions and 15 deletions

View file

@ -112,7 +112,7 @@ class LinkFinder
$sNameLink = $sLink; $sNameLink = $sLink;
if (!\preg_match('/^[a-z]{3,5}\:\/\//i', \ltrim($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>'; return '<a '.($bAddTargetBlank ? 'target="_blank" ': '').'href="'.$sLink.'">'.$sNameLink.'</a>';

View file

@ -482,15 +482,7 @@ class PdoAddressBook
$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl); $sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl); $sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl); $sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
$sUrl = 'https://'.$sUrl;
if (\preg_match('/^(google\.|dav\.fruux\.com|contacts\.icloud\.com)/i', $sUrl))
{
$sUrl = 'https://'.$sUrl;
}
else
{
$sUrl = 'http://'.$sUrl;
}
} }
$aUrl = \parse_url($sUrl); $aUrl = \parse_url($sUrl);

View file

@ -5,9 +5,9 @@
<div class="span4"> <div class="span4">
<div class="rl-logo"></div> <div class="rl-logo"></div>
<div style="margin-left: 30px;"> <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 /> <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> </div>
<div class="rl-desc" style="float: left"> <div class="rl-desc" style="float: left">
@ -65,12 +65,12 @@
<div data-bind="visible: 'updating' === statusType()"> <div data-bind="visible: 'updating' === statusType()">
<i class="icon-spinner animated"></i> <i class="icon-spinner animated"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
<span data-i18n="TAB_ABOUT/LABEL_UPDATING"></span>&hellip; <span data-i18n="TAB_ABOUT/LABEL_UPDATING"></span>
</div> </div>
<div data-bind="visible: 'checking' === statusType()"> <div data-bind="visible: 'checking' === statusType()">
<i class="icon-spinner animated"></i> <i class="icon-spinner animated"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
<span data-i18n="TAB_ABOUT/LABEL_CHECKING"></span>&hellip; <span data-i18n="TAB_ABOUT/LABEL_CHECKING"></span>
</div> </div>
</h5> </h5>
</div> </div>

View file

@ -245,7 +245,7 @@
<div data-bind="foreach: viewPropertiesWeb"> <div data-bind="foreach: viewPropertiesWeb">
<div class="property-line"> <div class="property-line">
<span class="contactValueLargeStatic" data-bind="text: value"></span> <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" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" /> data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
</div> </div>