Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 17:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PHP 7.4 Deprecate message

Browse source
This commit is contained in:
djmaze 2020-03-16 14:27:17 +01:00
parent 26c38b3ec9
commit 7eb1defa16
7 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -487,7 +487,7 @@ END;
{ {
$iPos = \strpos($aTempArr[1], '?', 2); $iPos = \strpos($aTempArr[1], '?', 2);
$aTempArr[0] = \substr($aTempArr[1], 2, $iPos - 2); $aTempArr[0] = \substr($aTempArr[1], 2, $iPos - 2);
$sEncType = \strtoupper($aTempArr[1]{$iPos + 1}); $sEncType = \strtoupper($aTempArr[1][$iPos + 1]);
switch ($sEncType) switch ($sEncType)
{ {
case 'Q': case 'Q':
@ -1591,13 +1591,13 @@ END;
for ($iIndex = 0; $iLen > 0; $iIndex++, $iLen--) for ($iIndex = 0; $iLen > 0; $iIndex++, $iLen--)
{ {
$sChar = $sStr{$iIndex}; $sChar = $sStr[$iIndex];
if ($sChar == '&') if ($sChar == '&')
{ {
$iIndex++; $iIndex++;
$iLen--; $iLen--;
$sChar = isset($sStr{$iIndex}) ? $sStr{$iIndex} : null; $sChar = isset($sStr[$iIndex]) ? $sStr[$iIndex] : null;
if ($sChar === null) if ($sChar === null)
{ {
break; break;
@ -1613,7 +1613,7 @@ END;
$iK = 10; $iK = 10;
for (; $iLen > 0; $iIndex++, $iLen--) for (; $iLen > 0; $iIndex++, $iLen--)
{ {
$sChar = $sStr{$iIndex}; $sChar = $sStr[$iIndex];
$iB = $aArray[\ord($sChar)]; $iB = $aArray[\ord($sChar)];
if ((\ord($sChar) & 0x80) || $iB == -1) if ((\ord($sChar) & 0x80) || $iB == -1)
@ -1657,7 +1657,7 @@ END;
if (($iCh || $iK < 6) || if (($iCh || $iK < 6) ||
(!$iLen || $sChar != '-') || (!$iLen || $sChar != '-') ||
($iLen > 2 && '&' === $sStr{$iIndex+1} && '-' !== $sStr{$iIndex+2})) ($iLen > 2 && '&' === $sStr[$iIndex+1] && '-' !== $sStr[$iIndex+2]))
{ {
return $bError; return $bError;
} }
@ -1690,7 +1690,7 @@ END;
while ($sLen) while ($sLen)
{ {
$iC = \ord($sStr{$iIndex}); $iC = \ord($sStr[$iIndex]);
if ($iC < 0x80) if ($iC < 0x80)
{ {
$iCh = $iC; $iCh = $iC;
@ -1740,7 +1740,7 @@ END;
for ($iJ = 0; $iJ < $iN; $iJ++) for ($iJ = 0; $iJ < $iN; $iJ++)
{ {
$iO = \ord($sStr{$iIndex+$iJ}); $iO = \ord($sStr[$iIndex+$iJ]);
if (($iO & 0xc0) != 0x80) if (($iO & 0xc0) != 0x80)
{ {
return $bError; return $bError;

4
rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php
View file

@ -89,11 +89,11 @@ class Email
while ($iCurrentIndex < \strlen($sEmailAddress)) while ($iCurrentIndex < \strlen($sEmailAddress))
{ {
switch ($sEmailAddress{$iCurrentIndex}) switch ($sEmailAddress[$iCurrentIndex])
{ {
// case '\'': // case '\'':
case '"': case '"':
// $sQuoteChar = $sEmailAddress{$iCurrentIndex}; // $sQuoteChar = $sEmailAddress[$iCurrentIndex];
if ((!$bInName) && (!$bInAddress) && (!$bInComment)) if ((!$bInName) && (!$bInAddress) && (!$bInComment))
{ {
$bInName = true; $bInName = true;

6
rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
View file

@ -119,16 +119,16 @@ class EmailCollection extends \MailSo\Base\Collection
while ($iCurrentPos < $sWorkingRecipientsLen) while ($iCurrentPos < $sWorkingRecipientsLen)
{ {
switch ($sWorkingRecipients{$iCurrentPos}) switch ($sWorkingRecipients[$iCurrentPos])
{ {
case '\'': case '\'':
case '"': case '"':
if (!$bIsInQuotes) if (!$bIsInQuotes)
{ {
$sChQuote = $sWorkingRecipients{$iCurrentPos}; $sChQuote = $sWorkingRecipients[$iCurrentPos];
$bIsInQuotes = true; $bIsInQuotes = true;
} }
else if ($sChQuote == $sWorkingRecipients{$iCurrentPos}) else if ($sChQuote == $sWorkingRecipients[$iCurrentPos])
{ {
$bIsInQuotes = false; $bIsInQuotes = false;
} }

4
rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailDep.php
View file

@ -96,11 +96,11 @@ class EmailDep
while ($iCurrentIndex < \strlen($sEmailAddress)) while ($iCurrentIndex < \strlen($sEmailAddress))
{ {
switch ($sEmailAddress{$iCurrentIndex}) switch ($sEmailAddress[$iCurrentIndex])
{ {
// case '\'': // case '\'':
case '"': case '"':
// $sQuoteChar = $sEmailAddress{$iCurrentIndex}; // $sQuoteChar = $sEmailAddress[$iCurrentIndex];
if ((!$bInName) && (!$bInAddress) && (!$bInComment)) if ((!$bInName) && (!$bInAddress) && (!$bInComment))
{ {
$bInName = true; $bInName = true;

2
rainloop/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
View file

@ -273,7 +273,7 @@ class ManageSieveClient extends \MailSo\Net\NetClient
$sScript = ''; $sScript = '';
if (\is_array($mResponse) && 0 < \count($mResponse)) if (\is_array($mResponse) && 0 < \count($mResponse))
{ {
if ('{' === $mResponse[0]{0}) if ('{' === $mResponse[0][0])
{ {
\array_shift($mResponse); \array_shift($mResponse);
} }

8
rainloop/v/0.0.0/app/libraries/MailSo/Vendors/Net/IDNA2.php
View file

@ -2622,7 +2622,7 @@ class Net_IDNA2
if ($delim_pos > self::_byteLength($this->_punycode_prefix)) { if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) { for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
$decoded[] = ord($encoded{$k}); $decoded[] = ord($encoded[$k]);
} }
} else { } else {
$decoded = array(); $decoded = array();
@ -2639,7 +2639,7 @@ class Net_IDNA2
for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) { for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) { for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
$digit = $this->_decodeDigit($encoded{$enco_idx++}); $digit = $this->_decodeDigit($encoded[$enco_idx++]);
$idx += $digit * $w; $idx += $digit * $w;
$t = ($k <= $bias) ? $t = ($k <= $bias) ?
@ -3006,7 +3006,7 @@ class Net_IDNA2
$mode = 'next'; $mode = 'next';
$test = 'none'; $test = 'none';
for ($k = 0; $k < $inp_len; ++$k) { for ($k = 0; $k < $inp_len; ++$k) {
$v = ord($input{$k}); // Extract byte from input string $v = ord($input[$k]); // Extract byte from input string
if ($v < 128) { // We found an ASCII char - put into stirng as is if ($v < 128) { // We found an ASCII char - put into stirng as is
$output[$out_len] = $v; $output[$out_len] = $v;
@ -3161,7 +3161,7 @@ class Net_IDNA2
$out_len++; $out_len++;
$output[$out_len] = 0; $output[$out_len] = 0;
} }
$output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) ); $output[$out_len] += ord($input[$i]) << (8 * (3 - ($i % 4) ) );
} }
return $output; return $output;
} }

6
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -7866,7 +7866,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
{ {
while (($sFile = \readdir($rDirH)) !== false) while (($sFile = \readdir($rDirH)) !== false)
{ {
if ('.' !== $sFile{0} && \is_dir($sDir.'/'.$sFile) && \file_exists($sDir.'/'.$sFile.'/styles.less')) if ('.' !== $sFile[0] && \is_dir($sDir.'/'.$sFile) && \file_exists($sDir.'/'.$sFile.'/styles.less'))
{ {
if ('Default' === $sFile) if ('Default' === $sFile)
{ {
@ -7894,7 +7894,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
{ {
while (($sFile = \readdir($rDirH)) !== false) while (($sFile = \readdir($rDirH)) !== false)
{ {
if ('.' !== $sFile{0} && \is_dir($sDir.'/'.$sFile) && \file_exists($sDir.'/'.$sFile.'/styles.less')) if ('.' !== $sFile[0] && \is_dir($sDir.'/'.$sFile) && \file_exists($sDir.'/'.$sFile.'/styles.less'))
{ {
$sList[] = $sFile.'@custom'; $sList[] = $sFile.'@custom';
} }
@ -7944,7 +7944,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
{ {
while (($sFile = \readdir($rDirH)) !== false) while (($sFile = \readdir($rDirH)) !== false)
{ {
if ('.' !== $sFile{0} && \is_file($sDir.'/'.$sFile) && '.yml' === \substr($sFile, -4)) if ('.' !== $sFile[0] && \is_file($sDir.'/'.$sFile) && '.yml' === \substr($sFile, -4))
{ {
$sLang = \substr($sFile, 0, -4); $sLang = \substr($sFile, 0, -4);
if (0 < \strlen($sLang) && 'always' !== $sLang && '_source.en' !== $sLang) if (0 < \strlen($sLang) && 'always' !== $sLang && '_source.en' !== $sLang)