mirror of
https://github.com/ad-aures/castopod.git
synced 2026-04-14 20:17:46 +02:00
refactor: add modules folder to phpstan paths + fix errors
This commit is contained in:
parent
7a6d9df6db
commit
bb628f355f
166 changed files with 452 additions and 526 deletions
|
|
@ -115,6 +115,7 @@ class ContributorController extends BaseController
|
|||
|
||||
public function attemptCreate(): RedirectResponse
|
||||
{
|
||||
/** @var User $user */
|
||||
$user = (new UserModel())->find((int) $this->request->getPost('user'));
|
||||
|
||||
if (get_podcast_group($user, $this->podcast->id)) {
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ use CodeIgniter\HTTP\RedirectResponse;
|
|||
use CodeIgniter\HTTP\RequestInterface;
|
||||
use CodeIgniter\HTTP\ResponseInterface;
|
||||
use CodeIgniter\Shield\Controllers\MagicLinkController as ShieldMagicLinkController;
|
||||
use Modules\Auth\Config\Auth;
|
||||
use Modules\Auth\Models\UserModel;
|
||||
use CodeIgniter\Shield\Entities\User;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use ViewThemes\Theme;
|
||||
|
||||
|
|
@ -33,7 +32,7 @@ class MagicLinkController extends ShieldMagicLinkController
|
|||
public function setPasswordView(): string | RedirectResponse
|
||||
{
|
||||
if (! session('magicLogin')) {
|
||||
return redirect()->to(config(Auth::class)->loginRedirect());
|
||||
return redirect()->to(config('Auth')->loginRedirect());
|
||||
}
|
||||
|
||||
return view(setting('Auth.views')['magic-link-set-password']);
|
||||
|
|
@ -54,17 +53,16 @@ class MagicLinkController extends ShieldMagicLinkController
|
|||
|
||||
$validData = $this->validator->getValidated();
|
||||
|
||||
// set new password to user
|
||||
auth()
|
||||
->user()
|
||||
->password = $validData['new_password'];
|
||||
$user = auth()
|
||||
->user();
|
||||
|
||||
$userModel = new UserModel();
|
||||
if (! $userModel->update(auth()->user()->id, auth()->user())) {
|
||||
return redirect()
|
||||
->back()
|
||||
->withInput()
|
||||
->with('errors', $userModel->errors());
|
||||
if ($user instanceof User) {
|
||||
// set new password to user
|
||||
$user->password = $validData['new_password'];
|
||||
|
||||
$userModel = auth()
|
||||
->getProvider();
|
||||
$userModel->save($user);
|
||||
}
|
||||
|
||||
// remove magic login session to reinstate normal check
|
||||
|
|
@ -73,7 +71,7 @@ class MagicLinkController extends ShieldMagicLinkController
|
|||
}
|
||||
|
||||
// Success!
|
||||
return redirect()->to(config(Auth::class)->loginRedirect())
|
||||
return redirect()->to(config('Auth')->loginRedirect())
|
||||
->with('message', lang('MyAccount.messages.passwordChangeSuccess'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ declare(strict_types=1);
|
|||
namespace Modules\Auth\Controllers;
|
||||
|
||||
use CodeIgniter\HTTP\RedirectResponse;
|
||||
use CodeIgniter\Shield\Entities\User;
|
||||
use Modules\Admin\Controllers\BaseController;
|
||||
use Modules\Auth\Models\UserModel;
|
||||
|
||||
class MyAccountController extends BaseController
|
||||
{
|
||||
|
|
@ -60,17 +60,16 @@ class MyAccountController extends BaseController
|
|||
->with('error', lang('MyAccount.messages.wrongPasswordError'));
|
||||
}
|
||||
|
||||
// set new password to user
|
||||
auth()
|
||||
->user()
|
||||
->password = $validData['new_password'];
|
||||
$user = auth()
|
||||
->user();
|
||||
|
||||
$userModel = new UserModel();
|
||||
if (! $userModel->update(auth()->user()->id, auth()->user())) {
|
||||
return redirect()
|
||||
->back()
|
||||
->withInput()
|
||||
->with('errors', $userModel->errors());
|
||||
if ($user instanceof User) {
|
||||
// set new password to user
|
||||
$user->password = $validData['new_password'];
|
||||
|
||||
$userModel = auth()
|
||||
->getProvider();
|
||||
$userModel->save($user);
|
||||
}
|
||||
|
||||
// Success!
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ use CodeIgniter\I18n\Time;
|
|||
use CodeIgniter\Shield\Authentication\Authenticators\Session;
|
||||
use CodeIgniter\Shield\Entities\User;
|
||||
use CodeIgniter\Shield\Exceptions\ValidationException;
|
||||
use CodeIgniter\Shield\Models\UserIdentityModel;
|
||||
use Modules\Admin\Controllers\BaseController;
|
||||
use Modules\Auth\Models\UserModel;
|
||||
|
||||
|
|
@ -115,8 +114,7 @@ class UserController extends BaseController
|
|||
|
||||
// **** SEND WELCOME LINK FOR FIRST LOGIN ****
|
||||
|
||||
/** @var UserIdentityModel $identityModel */
|
||||
$identityModel = model(UserIdentityModel::class);
|
||||
$identityModel = model('UserIdentityModel');
|
||||
|
||||
// Delete any previous magic-link identities
|
||||
$identityModel->deleteIdentitiesByType($user, Session::ID_TYPE_MAGIC_LINK);
|
||||
|
|
@ -137,7 +135,7 @@ class UserController extends BaseController
|
|||
$email->setTo($user->email);
|
||||
$email->setSubject(lang('Auth.welcomeSubject', [
|
||||
'siteName' => setting('App.siteName'),
|
||||
], null, false));
|
||||
]));
|
||||
$email->setMessage(view(setting('Auth.views')['welcome-email'], [
|
||||
'token' => $token,
|
||||
], [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue