fix(Email): Fix Email Can't Send

Signed-off-by: Rhilip <rhilipruan@gmail.com>
Rhilip · Jun 7, 2019 · 5e5634e · 5e5634e
1 parent f830f22
commit 5e5634e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - **Invite:** Add Fine-grained control of recycle pending
 - **Register:** Add captcha checker
 - **Tracker:** Add miss port check for field ipv6_port
+- **View:** Fix Conversion::setDefault()
 - **View:** remove view helper function `get_torrent_uploader_id`
 - **View:** Fix view function redeclare
 

diff --git a/apps/libraries/Mailer.php b/apps/libraries/Mailer.php
@@ -32,7 +32,7 @@ class Mailer extends BaseObject
     /** @var PHPMailer */
     public $_mailer;
 
-    public function onConstruct()
+    public function onInitialize()
     {
         $mail = new PHPMailer(true);
 

diff --git a/apps/models/form/UserConfirmForm.php b/apps/models/form/UserConfirmForm.php
@@ -104,7 +104,7 @@ public function flush_recover() {
             'username' => $this->username,
             'password' => $new_password,
         ]);
-        $mail_sender = \apps\Libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
+        $mail_sender = \apps\libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
         $mail_sender->send([$this->email], 'New Password', $mail_body);
 
         return true;

diff --git a/apps/models/form/UserInviteForm.php b/apps/models/form/UserInviteForm.php
@@ -151,7 +151,7 @@ public function flush()
                 'username' => $this->username,
                 'invite_link' => $this->invite_link,
             ]);
-            $mail_sender = \apps\Libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
+            $mail_sender = \apps\libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
             $mail_sender->send([$this->email], 'Invite To RidPT', $mail_body);
         }
         return $invite_status;

diff --git a/apps/models/form/UserRecoverForm.php b/apps/models/form/UserRecoverForm.php
@@ -68,7 +68,7 @@ public function flush() {
                 'username' => $user_info['username'],
                 'confirm_url' => $confirm_url,
             ]);
-            $mail_sender = \apps\Libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
+            $mail_sender = \apps\libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
             $mail_sender->send([$this->email], 'Please confirm your action to recover your password', $mail_body);
         }
         return true;

diff --git a/apps/models/form/UserRegisterForm.php b/apps/models/form/UserRegisterForm.php
@@ -293,7 +293,7 @@ public function flush()
                 'username' => $this->username,
                 'confirm_url' => $confirm_url,
             ]);
-            $mail_sender = \apps\Libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
+            $mail_sender = \apps\libraries\Mailer::newInstanceByConfig('libraries.[mailer]');
             $mail_sender->send([$this->email], 'Please confirm your accent', $mail_body);
         }
 

diff --git a/apps/task/CronTabTimer.php b/apps/task/CronTabTimer.php
@@ -95,11 +95,12 @@ protected function clean_expired_session() {
 
     // TODO sync sessions from database to redis to avoid lost (Maybe)...
 
+    protected function expired_invitee () {
+        app()->pdo->createCommand('UPDATE `invite` SET `used` = -1 WHERE `expire_at` < NOW() AND `used` = 0')->execute();
+
+
 
-    protected function expired_temporarily_invites() {
-        app()->pdo->createCommand('UPDATE `user_invitations` SET `used` = `total` WHERE expire_at > NOW() AND `total` != `used`');
         $count = app()->pdo->getRowCount();
-        $this->print_log('Success Expired ' . $count . ' Temporarily invites');
+        $this->print_log('Success Expired ' . $count . ' invites');
     }
-
 }
diff --git a/apps/views/email/layout.php b/apps/views/email/layout.php
@@ -75,8 +75,7 @@
                             <div style="color:#555555;line-height:150%;padding: 15px 10px 10px;font-size: 14px; text-align: left; margin: 0;">
                                 <?= $this->section('body') ?>
                                 <hr>
-                                Time: <?= date('Y-m-d H:i:s'); ?>
-                                IP: <?= app()->request->getClientIp(); ?>
+                                Action at <?= date('Y-m-d H:i:s'); ?> From IP: <?= app()->request->getClientIp(); ?>
                             </div>
                         </div>
                     </div>