diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 0c0175d14..0451a409b 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -150,56 +150,61 @@ class AuthController extends Controller
*/
public function postRegister(User $user, RegisterRequest $request)
{
- $request_array = $request->input();
- $password = Hash::make($request->input('password'));
- $user->password = $password;
- $name = $request->input('full_name');
- $user->first_name = $name;
- if ($request_array['email'] == '') {
- $user->email = null;
- } else {
- $user->email = $request->input('email');
- }
- if ($request_array['mobile'] == '') {
+ try{
+ $request_array = $request->input();
+ $password = Hash::make($request->input('password'));
+ $user->password = $password;
+ $name = $request->input('full_name');
+ $user->first_name = $name;
+ if ($request_array['email'] == '') {
+ $user->email = null;
+ } else {
+ $user->email = $request->input('email');
+ }
+ if ($request_array['mobile'] == '') {
$user->mobile = null;
- } else {
- $user->mobile = $request->input('mobile');
- }
- if ($request_array['code'] == '') {
- $user->country_code = 0;
- } else {
- $user->country_code = $request->input('code');
- }
- if ($request_array['email'] != '') {
- $user->user_name = $request->input('email');
- } else {
- $user->user_name = $request->input('mobile');
- }
- $user->role = 'user';
- $code = str_random(60);
- $user->remember_token = $code;
- $user->save();
- $message12 = '';
- $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
- $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
- // Event for login
- \Event::fire(new \App\Events\LoginEvent($request));
- $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
- if ($settings->status == 1 || $settings->status == '1') {
- if (count($sms) > 0) {
- if ($sms->status == 1 || $sms->status == '1') {
- $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
+ } else {
+ $user->mobile = $request->input('mobile');
+ }
+ if ($request_array['code'] == '') {
+ $user->country_code = 0;
+ } else {
+ $user->country_code = $request->input('code');
+ }
+ if ($request_array['email'] != '') {
+ $user->user_name = $request->input('email');
+ } else {
+ $user->user_name = $request->input('mobile');
+ }
+ $user->role = 'user';
+ $code = str_random(60);
+ $user->remember_token = $code;
+ $user->save();
+ $message12 = '';
+ $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
+ $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
+ // Event for login
+ \Event::fire(new \App\Events\LoginEvent($request));
+ if ($request_array['email'] != '') {
+ $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
+ }
+ if ($settings->status == 1 || $settings->status == '1') {
+ if (count($sms) > 0) {
+ if ($sms->status == 1 || $sms->status == '1') {
+ $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
+ } else {
+ $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
+ }
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
}
} else {
- $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
+ $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
}
- } else {
- $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
- }
-
- return redirect('home')->with('success', $message12);
+ return redirect('home')->with('success', $message12);
+ } catch (\Exception $e) {
+ return redirect()->back()->with('fails', $e->getMessage());
+ }
}
/**
diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php
index a95078f4d..c3186cbd3 100644
--- a/app/Http/Controllers/Common/PhpMailController.php
+++ b/app/Http/Controllers/Common/PhpMailController.php
@@ -12,6 +12,7 @@ use App\User;
use Auth;
use Exception;
use Mail;
+use Lang;
class PhpMailController extends Controller
{
@@ -75,7 +76,7 @@ class PhpMailController extends Controller
{
$from_address = $this->fetch_smtp_details($from);
if ($from_address == null) {
- throw new Exception('Invalid Email Configuration');
+ throw new Exception(Lang::get('lang.system-email-not-configured'));
}
$this->setMailConfig($from_address);
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 1f50760d8..9ade0c26a 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -86,7 +86,7 @@ return [
'activate_your_account_click_on_Link_that_send_to_your_mail' => 'Activate your account! Click on the link that we\'ve sent to your mail',
'activate_your_account_click_on_Link_that_send_to_your_mail_and_moble' => 'Activate your account! Click on the link that we\'ve sent to your mail or login to your account and enter the OTP code we\'ve sent on your mobile number',
'activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup' => 'Account created, please contact to system admin as we were unable to send OTP code to your mobile and email to your email address.',
- 'this_field_do_not_match_our_records' => ' does not match our records.',
+ 'this_field_do_not_match_our_records' => ' This field does not match our records.',
'we_have_e-mailed_your_password_reset_link' => 'We have emailed your password reset link!',
"we_can't_find_a_user_with_that_e-mail_address" => "We can't find a user with that email address.",
/*
@@ -1551,5 +1551,6 @@ return [
/*********** Updated 3-12-2016 **********/
'activate' => 'Activate',
+ 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.',
];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 819e52332..1e718f294 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -13,13 +13,7 @@
@stop
-@if(Session::has('status'))
-
- {!! Lang::get('lang.success') !!}
-
- {{Session::get('status')}}
-
-@endif
+
@stop
-@if(Session::has('status'))
-
- {!! Lang::get('lang.success') !!}
-
- {{Session::get('status')}}
-
-@endif
-
-
-
@section('breadcrumb')
@@ -44,6 +24,13 @@
@stop
@section('content')
+@if(Session::has('status'))
+
+ {!! Lang::get('lang.success') !!}
+
+ {{Session::get('status')}}
+
+@endif
@if (count($errors) > 0)
@@ -117,7 +104,6 @@
{!! Form::text('full_name',null,['placeholder'=>Lang::get('lang.full_name'),'class' => 'form-control']) !!}
- {!! $errors->first('full_name', ':message') !!}
@@ -125,13 +111,11 @@
{!! Form::text('email',null,['placeholder'=>Lang::get('lang.email'),'class' => 'form-control']) !!}
- {!! $errors->first('email', ':message') !!}
@elseif (($settings->status == 0 || $settings->status == '0') && ($email_mandatory->status == 0 || $email_mandatory->status == '0'))
{!! Form::text('email',null,['placeholder'=>Lang::get('lang.email'),'class' => 'form-control']) !!}
- {!! $errors->first('email', ':message') !!}
@else
{!! Form::hidden('email', null) !!}
@@ -141,14 +125,12 @@
{!! Form::text('code',null,['placeholder'=>91,'class' => 'form-control']) !!}
- {!! $errors->first('code', ':message') !!}
{!! Form::text('mobile',null,['placeholder'=>Lang::get('lang.mobile'),'class' => 'form-control']) !!}
- {!! $errors->first('mobile', ':message') !!}
@@ -162,7 +144,6 @@
{!! Form::password('password',['placeholder'=>Lang::get('lang.password'),'class' => 'form-control']) !!}
- {!! $errors->first('password', ':message') !!}
@@ -170,7 +151,6 @@
{!! Form::password('password_confirmation',['placeholder'=>Lang::get('lang.retype_password'),'class' => 'form-control']) !!}
- {!! $errors->first('password_confirmation', ':message') !!}
diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php
index 495a6b7c3..2b183e221 100644
--- a/resources/views/themes/default1/client/helpdesk/form.blade.php
+++ b/resources/views/themes/default1/client/helpdesk/form.blade.php
@@ -57,6 +57,7 @@ class = "active"
@if(Session::has('check'))
@endif
+ @if(!Session::has('error'))
{!! Lang::get('lang.alert') !!} !
@@ -67,6 +68,7 @@ class = "active"
@endforeach
+ @endif
@endif
diff --git a/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php b/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
index e2ccaa062..acc8d9acc 100644
--- a/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
+++ b/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
@@ -22,6 +22,18 @@
@stop
@section('content')
+@if(!Session::has('error'))
+
+
+
{!! Lang::get('lang.alert') !!} !
+
+
+ @foreach ($errors->all() as $error)
+ - {{ $error }}
+ @endforeach
+
+