Misterzym
/
CodeIgniter-Aauth
mirror of https://github.com/misterzym/CodeIgniter-Aauth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

enhanced email functions 

- added phpmailer
 - updated email related functions to use phpmailer
v3-dev
REJack 6 years ago
parent
00c0914f81
commit
c5072c6be2
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
2 changed files with 139 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 150
      app/Libraries/Aauth.php
  2. 3
      composer.json

150
app/Libraries/Aauth.php
Unescape View File

@ -29,6 +29,7 @@ use \App\Models\Aauth\GroupVariableModel;
use \App\Models\Aauth\PermModel; use \App\Models\Aauth\PermModel;
use \App\Models\Aauth\PermToGroupModel; use \App\Models\Aauth\PermToGroupModel;
use \App\Models\Aauth\PermToUserModel; use \App\Models\Aauth\PermToUserModel;
use PHPMailer\PHPMailer\PHPMailer;
/** /**
* Aauth Library * Aauth Library
@ -957,17 +958,54 @@ class Aauth
* *
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
// protected function sendVerification(int $userId, string $email) protected function sendVerification(int $userId, string $email)
// { {
// helper('text'); helper('text');
// $userVariableModel = new UserVariableModel(); $userVariableModel = new UserVariableModel();
// $emailService = \Config\Services::email(); // $emailService = \Config\Services::email();
// $verificationCode = sha1(strtotime('now')); $emailService = new PHPMailer;
$verificationCode = sha1(strtotime('now'));
// $userVariableModel->save($userId, 'verification_code', $verificationCode, true); $userVariableModel->save($userId, 'verification_code', $verificationCode, true);
// $messageData['code'] = $verificationCode; $messageData['code'] = $verificationCode;
// $messageData['link'] = site_url($this->config->linkVerification . '/' . $userId . '/' . $verificationCode); $messageData['link'] = site_url($this->config->linkVerification . '/' . $userId . '/' . $verificationCode);
if (isset($this->config->emailConfig->protocol))
{
if ($this->config->emailConfig->protocol === 'smtp')
{
$emailService->isSMTP();
$emailService->Host = $this->config->emailConfig->SMTPHost ? : '';
$emailService->SMTPAuth = true;
$emailService->Username = $this->config->emailConfig->SMTPUser ? : '';
$emailService->Password = $this->config->emailConfig->SMTPPass ? : '';
$emailService->SMTPSecure = $this->config->emailConfig->SMTPCrypto ? : 'tls';
$emailService->Port = $this->config->emailConfig->SMTPPort ? : 587;
}
else if ($this->config->emailConfig->protocol === 'sendmail')
{
$emailService->isSendmail();
}
else if ($this->config->emailConfig->protocol === 'mail')
{
}
}
$emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
$emailService->addAddress($email);
$emailService->isHTML(true);
$emailService->Subject = lang('Aauth.subjectVerification');
$emailService->Body = view('Aauth/Verification', $messageData);
if (! $emailService->send())
{
$this->error(explode('<br />', $emailService->ErrorInfo));
return false;
}
return true;
// $emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []); // $emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []);
// $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName); // $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
@ -976,7 +1014,7 @@ class Aauth
// $emailService->setMessage(view('Aauth/Verification', $messageData)); // $emailService->setMessage(view('Aauth/Verification', $messageData));
// return $emailService->send(); // return $emailService->send();
// } }
/** /**
* Verify user * Verify user
@ -1245,26 +1283,61 @@ class Aauth
} }
$userVariableModel = new UserVariableModel(); $userVariableModel = new UserVariableModel();
$emailService = \Config\Services::email(); // $emailService = \Config\Services::email();
$emailService = new PHPMailer;
$resetCode = sha1(strtotime('now')); $resetCode = sha1(strtotime('now'));
$userVariableModel->save($user['id'], 'verification_code', $resetCode, true); $userVariableModel->save($user['id'], 'verification_code', $resetCode, true);
$messageData['code'] = $resetCode; $messageData['code'] = $resetCode;
$messageData['link'] = site_url($this->config->linkResetPassword . '/' . $resetCode); $messageData['link'] = site_url($this->config->linkResetPassword . '/' . $resetCode);
$emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []); if (isset($this->config->emailConfig->protocol))
{
if ($this->config->emailConfig->protocol === 'smtp')
{
$emailService->isSMTP();
$emailService->Host = $this->config->emailConfig->SMTPHost ? : '';
$emailService->SMTPAuth = true;
$emailService->Username = $this->config->emailConfig->SMTPUser ? : '';
$emailService->Password = $this->config->emailConfig->SMTPPass ? : '';
$emailService->SMTPSecure = $this->config->emailConfig->SMTPCrypto ? : 'tls';
$emailService->Port = $this->config->emailConfig->SMTPPort ? : 587;
}
else if ($this->config->emailConfig->protocol === 'sendmail')
{
$emailService->isSendmail();
}
else if ($this->config->emailConfig->protocol === 'mail')
{
}
}
$emailService->setFrom($this->config->emailFrom, $this->config->emailFromName); $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
$emailService->setTo($user['email']); $emailService->addAddress($user['email']);
$emailService->setSubject(lang('Aauth.subjectReset')); $emailService->isHTML(true);
$emailService->setMessage(view('Aauth/RemindPassword', $messageData)); $emailService->Subject = lang('Aauth.subjectReset');
$emailService->Body = view('Aauth/RemindPassword', $messageData);
if (! $email = $emailService->send()) if (! $email = $emailService->send())
{ {
$this->error(explode('<br />', $emailService->printDebugger([]))); $this->error(explode('<br />', $emailService->ErrorInfo));
return false; return false;
} }
// $emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []);
// $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
// $emailService->setTo($user['email']);
// $emailService->setSubject(lang('Aauth.subjectReset'));
// $emailService->setMessage(view('Aauth/RemindPassword', $messageData));
// if (! $email = $emailService->send())
// {
// $this->error(explode('<br />', $emailService->printDebugger([])));
// return false;
// }
$this->info(lang('Aauth.infoRemindSuccess')); $this->info(lang('Aauth.infoRemindSuccess'));
return $email; return $email;
@ -1308,7 +1381,8 @@ class Aauth
return false; return false;
} }
$emailService = \Config\Services::email(); // $emailService = \Config\Services::email();
$emailService = new PHPMailer;
$data['id'] = $user['id']; $data['id'] = $user['id'];
$data['password'] = $password; $data['password'] = $password;
@ -1323,19 +1397,53 @@ class Aauth
$messageData['password'] = $password; $messageData['password'] = $password;
$emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []); if (isset($this->config->emailConfig->protocol))
{
if ($this->config->emailConfig->protocol === 'smtp')
{
$emailService->isSMTP();
$emailService->Host = $this->config->emailConfig->SMTPHost ? : '';
$emailService->SMTPAuth = true;
$emailService->Username = $this->config->emailConfig->SMTPUser ? : '';
$emailService->Password = $this->config->emailConfig->SMTPPass ? : '';
$emailService->SMTPSecure = $this->config->emailConfig->SMTPCrypto ? : 'tls';
$emailService->Port = $this->config->emailConfig->SMTPPort ? : 587;
}
else if ($this->config->emailConfig->protocol === 'sendmail')
{
$emailService->isSendmail();
}
else if ($this->config->emailConfig->protocol === 'mail')
{
}
}
$emailService->setFrom($this->config->emailFrom, $this->config->emailFromName); $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
$emailService->setTo($user['email']); $emailService->addAddress($user['email']);
$emailService->setSubject(lang('Aauth.subjectResetSuccess')); $emailService->isHTML(true);
$emailService->setMessage(view('Aauth/ResetPassword', $messageData)); $emailService->Subject = lang('Aauth.subjectResetSuccess');
$emailService->Body = view('Aauth/ResetPassword', $messageData);
if (! $email = $emailService->send()) if (! $email = $emailService->send())
{ {
$this->error(explode('<br />', $emailService->printDebugger([]))); $this->error(explode('<br />', $emailService->ErrorInfo));
return false; return false;
} }
// $emailService->initialize(isset($this->config->emailConfig) ? $this->config->emailConfig : []);
// $emailService->setFrom($this->config->emailFrom, $this->config->emailFromName);
// $emailService->setTo($user['email']);
// $emailService->setSubject(lang('Aauth.subjectResetSuccess'));
// $emailService->setMessage(view('Aauth/ResetPassword', $messageData));
// if (! $email = $emailService->send())
// {
// $this->error(explode('<br />', $emailService->printDebugger([])));
// return false;
// }
$this->info(lang('Aauth.infoResetSuccess')); $this->info(lang('Aauth.infoResetSuccess'));
return $email; return $email;

3
composer.json
Unescape View File

@ -11,7 +11,8 @@
"ext-json": "*", "ext-json": "*",
"kint-php/kint": "^2.1", "kint-php/kint": "^2.1",
"psr/log": "^1.1", "psr/log": "^1.1",
"zendframework/zend-escaper": "^2.5" "zendframework/zend-escaper": "^2.5",
"phpmailer/phpmailer": "^6.0"
}, },
"require-dev": { "require-dev": {
"codeigniter4/codeigniter4-standard": "^1.0", "codeigniter4/codeigniter4-standard": "^1.0",

Write Preview
Loading…
Cancel
Save