update 20.10.2025

This commit is contained in:
Kevin Adametz 2025-10-20 17:42:08 +02:00
parent 8c11130b5d
commit a939cd51ef
616 changed files with 84821 additions and 4121 deletions

55
app/Http/Controllers/Web/RegisterController.php Executable file → Normal file
View file

@ -39,6 +39,18 @@ class RegisterController extends Controller
public function index()
{
if (config('app.debug')) {
\Log::channel('doamin')->debug('RegisterController: index - Session user_shop', [
'session_user_shop_id' => \Session::get('user_shop')?->id,
'session_user_shop_name' => \Session::get('user_shop')?->name,
'session_user_shop_user_id' => \Session::get('user_shop')?->user_id,
'session_id' => \Session::getId(),
'session_domain' => config('session.domain'),
'request_host' => request()->getHost(),
'all_session_keys' => array_keys(\Session::all())
]);
}
$data = [
'GOOGLE_ReCAPTCHA_KEY' => $this->GOOGLE_ReCAPTCHA_KEY,
'user_shop' => Util::getUserShop(),
@ -49,12 +61,12 @@ class RegisterController extends Controller
public function member($member_id = false)
{
if(!$member_id){
if (!$member_id) {
return redirect('/registrierung');
}
$user_id = (int) str_replace('m', '', $member_id) - config('mivita.add_number_id');
$user = User::find($user_id);
if(!$user || !$user->isActive() || !$user->isActiveAccount()){
if (!$user || !$user->isActive() || !$user->isActiveAccount()) {
return redirect('/registrierung');
}
$data = [
@ -66,22 +78,23 @@ class RegisterController extends Controller
return view('web.templates.registrierung', $data);
}
public function register(){
public function register()
{
$rules = array(
'salutation' => 'required',
'first_name'=>'required',
'last_name'=>'required',
'first_name' => 'required',
'last_name' => 'required',
'email' => 'required|string|email|max:255|unique:users',
'email-confirm' => 'required|same:email',
'password' => 'required|string|min:6|confirmed',
'password_confirmation' => 'required|string|min:6',
'g-recaptcha-response'=>'required|recaptcha',
'g-recaptcha-response' => 'required|recaptcha',
'accepted_data_protection' => 'required',
);
Validator::extend('recaptcha', function($attribute, $value, $parameters, $validator) {
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
Validator::extend('recaptcha', function ($attribute, $value, $parameters, $validator) {
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
});
$validator = Validator::make(Request::all(), $rules);
@ -90,16 +103,15 @@ class RegisterController extends Controller
}
$user_shop = Util::getUserShop();
$data = Request::all();
$user = $this->userRepo->create($data);
$confirmation_code = UserService::createConfirmationCode();
$m_sponsor_id = 1;
if($user_shop){
if ($user_shop) {
$m_sponsor_id = $user_shop->user->id;
}
if(isset($data['from_member_id'])){
if (isset($data['from_member_id'])) {
$m_sponsor_id = (int) str_replace('m', '', $data['from_member_id']) - config('mivita.add_number_id');
}
$user->lang = !empty(\App::getLocale()) ? \App::getLocale() : "de";
@ -109,22 +121,19 @@ class RegisterController extends Controller
$user->m_sponsor = $m_sponsor_id;
$UserLevel = UserLevel::where('default', 1)->first();
if($UserLevel){
if ($UserLevel) {
$user->m_level = $UserLevel->id;
}else{
} else {
$user->m_level = 10;
}
$user->save();
$user->account->data_protection = now();
$user->account->save();
Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyAccount($confirmation_code, $user));
Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyAccount($confirmation_code, User::find($user->id)));
return redirect('/registrierung/finish');
}
public function finish()
@ -135,7 +144,7 @@ class RegisterController extends Controller
];
return view('web.templates.registrierung_finish', $data);
}
private function reCaptcha_validate($attribute, $value, $parameters, $validator)
{
@ -143,7 +152,8 @@ class RegisterController extends Controller
$response = $client->post(
'https://www.google.com/recaptcha/api/siteverify',
['form_params' =>
[
'form_params' =>
[
'secret' => $this->GOOGLE_ReCAPTCHA_SECRET,
'response' => $value
@ -154,7 +164,4 @@ class RegisterController extends Controller
$body = json_decode((string)$response->getBody());
return $body->success;
}
}
}