fix: send_email sending email including multiple users email

darkalchemy · Feb 5, 2020 · e274c85 · e274c85
1 parent 1d6f363
commit e274c85
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 49 deletions.
diff --git a/config/definitions.php b/config/definitions.php
@@ -63,53 +63,6 @@
 use SlashTrace\SlashTrace;
 
 return [
-    Ach_bonus::class => autowire(),
-    Achievement::class => autowire(),
-    Achievementlist::class => autowire(),
-    Ban::class => autowire(),
-    Block::class => autowire(),
-    Bonuslog::class => autowire(),
-    Bookmark::class => autowire(),
-    Bounty::class => autowire(),
-    BotReplies::class => autowire(),
-    BotTriggers::class => autowire(),
-    Cache::class => autowire(),
-    Casino::class => autowire(),
-    CasinoBets::class => autowire(),
-    Coin::class => autowire(),
-    Comment::class => autowire(),
-    Database::class => autowire(),
-    FailedLogin::class => autowire(),
-    Forum::class => autowire(),
-    HappyLog::class => autowire(),
-    Image::class => autowire(),
-    ImageProxy::class => autowire(),
-    IP::class => autowire(),
-    Jobby::class => autowire(),
-    Message::class => autowire(),
-    Mood::class => autowire(),
-    Notify::class => autowire(),
-    Offer::class => autowire(),
-    Parsedown::class => autowire(),
-    Peer::class => autowire(),
-    Phpzip::class => autowire(),
-    Poll::class => autowire(),
-    PollVoter::class => autowire(),
-    Post::class => autowire(),
-    Radiance::class => autowire(),
-    Referrer::class => autowire(),
-    Request::class => autowire(),
-    Searchcloud::class => autowire(),
-    Session::class => autowire(),
-    Settings::class => autowire(),
-    Sitelog::class => autowire(),
-    Snatched::class => autowire(),
-    Torrent::class => autowire(),
-    Upcoming::class => autowire(),
-    Userblock::class => autowire(),
-    User::class => autowire(),
-    Usersachiev::class => autowire(),
-    Wiki::class => autowire(),
     Auth::class => DI\factory(function (ContainerInterface $c) {
         $pdo = $c->get(PDO::class);
         $auth = new Auth($pdo, null, null, PRODUCTION);

diff --git a/include/function_html.php b/include/function_html.php
@@ -460,7 +460,13 @@ function send_mail($email, $subject, $html, $plain)
     $mail = $container->get(PHPMailer::class);
     if ($mail) {
         $mail->setFrom("{$site_config['site']['email']}", "{$site_config['chatbot']['name']}");
-        $mail->addAddress($email);
+        try {
+            $mail->addAddress($email);
+        } catch (Exception $e) {
+            $mail->smtp->reset();
+
+            return false;
+        }
         $mail->addReplyTo($site_config['site']['email']);
         $mail->isHTML(true);
         $mail->Subject = $subject;
@@ -471,11 +477,16 @@ function send_mail($email, $subject, $html, $plain)
 
             return true;
         } catch (Exception $e) {
-            stderr('PHPMailer Error', $e->getMessage());
+            $mail->smtp->reset();
+
+            return false;
+        } finally {
+            $mail->clearAddresses();
         }
     }
 
     return false;
+
 }
 
 /**