Merge pull request #3879 from zeroadam/Remove-Includes-#3873

[friendica.git] / include / Emailer.php

diff --git a/include/Emailer.php b/include/Emailer.php
index e11954200c5aa47807ab6c51255177a6fdc886c6..978b192189ea31db2eb357f301de015cc18679c6 100644 (file)
--- a/include/Emailer.php
+++ b/include/Emailer.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Core\PConfig;
+
 require_once('include/email.php');
 
 class Emailer {
@@ -16,13 +18,13 @@ class Emailer {
         * @param additionalMailHeader  additions to the smtp mail header
         * @param optional uid      user id of the destination user
         */
-       static public function send($params) {
+       public static function send($params) {
 
                call_hooks('emailer_send_prepare', $params);
 
                $email_textonly = False;
                if (x($params,"uid")) {
-                       $email_textonly = get_pconfig($params['uid'], "system", "email_textonly");
+                       $email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
                }
 
                $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
@@ -30,8 +32,8 @@ class Emailer {
 
                // generate a mime boundary
                $mimeBoundary   =rand(0,9)."-"
-                               .rand(10000000000,9999999999)."-"
-                               .rand(10000000000,9999999999)."=:"
+                               .rand(100000000,999999999)."-"
+                               .rand(100000000,999999999)."=:"
                                .rand(10000,99999);
 
                // generate a multipart/alternative message header
@@ -51,7 +53,7 @@ class Emailer {
                        "Content-Transfer-Encoding: base64\n\n" .
                        $textBody . "\n";
 
-               if (!$email_textonly && !is_null($htmlBody)){
+               if (!$email_textonly && !is_null($params['htmlVersion'])){
                        $multipartMessageBody .=
                                "--" . $mimeBoundary . "\n" .                           // text/html section
                                "Content-Type: text/html; charset=UTF-8\n" .
@@ -68,7 +70,7 @@ class Emailer {
                        'body' => $multipartMessageBody,
                        'headers' => $messageHeader
                );
-               echo "<pre>"; var_dump($hookdata); killme();
+               //echo "<pre>"; var_dump($hookdata); killme();
                call_hooks("emailer_send", $hookdata);
                $res = mail(
                        $hookdata['to'],                                                        // send to address
@@ -81,4 +83,3 @@ class Emailer {
                return $res;
        }
 }
-?>