make sure that values like '0' are valid in select options

[php-utility-classes.git] / classes / email.php-class

diff --git a/classes/email.php-class b/classes/email.php-class
index 4f35aa2054ce4d299892ac61aa22693f7933dd1e..7c20b5a1c34d3140a0a78328a33e4781ea7ec580 100644 (file)
--- a/classes/email.php-class
+++ b/classes/email.php-class
@@ -169,7 +169,7 @@ class email {
 
     if (in_array('to', $addrtype)) {
       foreach ($this->recipients as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'to');
@@ -178,7 +178,7 @@ class email {
     }
     if (in_array('cc', $addrtype)) {
       foreach ($this->cc as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'cc');
@@ -187,7 +187,7 @@ class email {
     }
     if (in_array('bcc', $addrtype)) {
       foreach ($this->bcc as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'bcc');
@@ -216,7 +216,7 @@ class email {
     if (count($this->recipients)) {
       $recpt = '';
       foreach ($this->recipients as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
           else { $recpt .= $address['mail'].','; }
         }
@@ -252,7 +252,7 @@ class email {
     if (count($this->attachments)) {
       // create random boundary, 20 chars, always beginning with KaiRo ;-)
       $boundary = 'KaiRo';
-      for ($i = 1; $i <= 15; $i++)     {
+      for ($i = 1; $i <= 15; $i++) {
         $r = rand(0, 61);
         if ($r < 10) { $boundary .= chr($r + 48); }
         elseif ($r < 36) { $boundary .= chr($r + 55); }
@@ -373,7 +373,7 @@ class email {
       // encode x09,x20 at lineends
       {
         $iLength = strlen($sLine);
-        $iLastChar = ord($sLine{$iLength-1});
+        $iLastChar = ord($sLine[$iLength-1]);
 
         //              !!!!!!!!
         // imap_8_bit does not encode x20 at the very end of a text,
@@ -383,7 +383,7 @@ class email {
         if (!($bEmulate_imap_8bit && ($i==count($aLines)-1)))
 
         if (($iLastChar==0x09)||($iLastChar==0x20)) {
-          $sLine{$iLength-1}='=';
+          $sLine[$iLength-1]='=';
           $sLine .= ($iLastChar==0x09)?'09':'20';
         }
       }    // imap_8bit encodes x20 before chr(13), too