From b79348363d8070ba638e76e17c63e58635cbc514 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 28 Jan 2020 18:44:54 +0300
Subject: [PATCH] fixed register email problem

---
 .../visiosoft/advs-module/src/Adv/AdvRepository.php    |  2 +-
 .../src/Profile/Register2/Register2FormHandler.php     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index a54f6a251..6856a282d 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -207,7 +207,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         } else {
             $query = $query->orderBy('advs_advs.created_at', 'desc');
             if ($isActiveDopings) {
-                $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query);
+                $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param);
             } else {
                 $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name',
                     'advs_advs_translations.advs_desc as advs_desc');
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index a8fae7993..f72e69826 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -46,8 +46,16 @@ class Register2FormHandler
 
         /* Create Profile in Register */
         if (!filter_var($builder->getPostValue('email'), FILTER_VALIDATE_EMAIL)) {
+
+            $domain = setting_value('streams::domain');
+
+            $domain = str_replace('https://', '', $domain);
+            $domain = str_replace('http://', '', $domain);
+            $domain = str_replace('/', '', $domain);
+            $domain = str_replace('www', '', $domain);
+
             $profile_parameters['gsm_phone'] = $builder->getPostValue('email');
-            $builder->setFormValue('email', $builder->getPostValue('email') . "@" . setting_value('streams::domain'));
+            $builder->setFormValue('email', $builder->getPostValue('email') . "@" . $domain);
         }
 
         $builder->saveForm(); // Save the new user.