X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Femail.php-class;h=ff03a17363534d9083423d5e7538b9e0427f412e;hp=0c485fe3dcbf2b9a81fab4fa6ca51bbbee1bf4a7;hb=c797f39a6abd6294e222b01d9be5d53ef442462a;hpb=a04c09ff2ce3bcd88c7600b3785ea19f8dba1823

diff --git a/include/classes/email.php-class b/include/classes/email.php-class
old mode 100755
new mode 100644
index 0c485fe..ff03a17
--- a/include/classes/email.php-class
+++ b/include/classes/email.php-class
@@ -96,6 +96,9 @@ class email {
   // public function addHeaderAddress($hname, $email, [$name])
   //   add an address header to the mail, possibly with both name and mail parts
   //
+  // public function setCharset($newcharset)
+  //   set charset for this mail
+  //
   // public function addMailText($textpart)
   //   add some text to the mail
   //
@@ -164,6 +167,8 @@ class email {
     $this->headers[] = array('name' => $hname, 'content' => $hcontent);
   }
 
+  public function setCharset($newcharset) { $this->charset = $newcharset; }
+
   public function addMailText($textpart) { $this->mailtext .= $textpart; }
 
   public function addAttachment($aname, $acontent, $atype = 'application/octet-stream') {
@@ -172,11 +177,13 @@ class email {
 
   public function getAddresses($addrtype = null) {
     // returns all addresses this mail gets sent to
-    $addrtype = explode(',', strtolower($addrtype));
-    if (!is_array($addrtype)) { $addrtype = array('to','cc','bcc'); }
+    if (!is_array($addrtype)) {
+      if (strlen($addrtype)) { $addrtype = explode(',', strtolower($addrtype)); }
+      else { $addrtype = array('to','cc','bcc'); }
+    }
     $mailaddresses = array();
 
-    if (in_array($addrtype, 'to')) {
+    if (in_array('to', $addrtype)) {
       foreach ($this->recipients as $address) {
         if (strlen(@$address['mail'])) {
           $mailaddresses[] = array('mail'=>$address['mail'],
@@ -185,7 +192,7 @@ class email {
         }
       }
     }
-    if (in_array($addrtype, 'cc')) {
+    if (in_array('cc', $addrtype)) {
       foreach ($this->cc as $address) {
         if (strlen(@$address['mail'])) {
           $mailaddresses[] = array('mail'=>$address['mail'],
@@ -194,7 +201,7 @@ class email {
         }
       }
     }
-    if (in_array($addrtype, 'bcc')) {
+    if (in_array('bcc', $addrtype)) {
       foreach ($this->bcc as $address) {
         if (strlen(@$address['mail'])) {
           $mailaddresses[] = array('mail'=>$address['mail'],
@@ -203,6 +210,8 @@ class email {
         }
       }
     }
+
+    return $mailaddresses;
   }
 
   public function send() {
@@ -334,7 +343,5 @@ class email {
     }
   return $mText;
   }
-
-
 }
 ?>