From 9b4028168d6e55f9c1d50809103b7ab700c0981e Mon Sep 17 00:00:00 2001
From: Michael Richter <m.richter@tu-berlin.de>
Date: Fri, 2 Mar 2018 10:00:23 +0100
Subject: [PATCH] add email username field

---
 .../Admin/helpdesk/EmailsController.php       | 27 ++++++++++---------
 .../Requests/helpdesk/EmailsEditRequest.php   |  2 +-
 .../helpdesk/emails/emails/edit.blade.php     | 12 ++++++---
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Admin/helpdesk/EmailsController.php b/app/Http/Controllers/Admin/helpdesk/EmailsController.php
index 7b9be5355..6c18a9fb5 100644
--- a/app/Http/Controllers/Admin/helpdesk/EmailsController.php
+++ b/app/Http/Controllers/Admin/helpdesk/EmailsController.php
@@ -103,7 +103,7 @@ class EmailsController extends Controller
     {
         //dd($request->all());
         try {
-            $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
+            $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
             $service = $request->input('sending_protocol');
             $validate = '/novalidate-cert';
             $fetch = 1;
@@ -174,6 +174,7 @@ class EmailsController extends Controller
         $email->email_address = $request->email_address;
 
         $email->email_name = $request->email_name;
+        $email->user_name = $request->user_name;
         $email->fetching_host = $request->fetching_host;
         $email->fetching_port = $request->fetching_port;
         $email->fetching_protocol = $request->fetching_protocol;
@@ -241,16 +242,17 @@ class EmailsController extends Controller
     {
         $mailservice_id = $request->input('sending_protocol');
         $driver = $this->getDriver($mailservice_id);
-        $username = $request->input('email_address');
+        $address = $request->input('email_address');
+        $username = $request->input('user_name');
         $password = $request->input('password');
         $name = $request->input('email_name');
         $host = $request->input('sending_host');
         $port = $request->input('sending_port');
         $enc = $request->input('sending_encryption');
-        $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
+        $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
 
         $this->emailService($driver, $service_request);
-        $this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
+        $this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
         $transport = \Swift_SmtpTransport::newInstance($host, $port, $enc);
         $transport->setUsername($username);
         $transport->setPassword($password);
@@ -264,30 +266,31 @@ class EmailsController extends Controller
     {
         $mailservice_id = $request->input('sending_protocol');
         $driver = $this->getDriver($mailservice_id);
-        $username = $request->input('email_address');
+        $address = $request->input('email_address');
+        $username = $request->input('user_name');
         $password = $request->input('password');
         $name = $request->input('email_name');
         $host = $request->input('sending_host');
         $port = $request->input('sending_port');
         $enc = $request->input('sending_encryption');
-        $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
+        $service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
 
         $this->emailService($driver, $service_request);
-        $this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
+        $this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
         $controller = new \App\Http\Controllers\Common\PhpMailController();
         $subject = 'test';
         $data = 'test';
         //dd(\Config::get('mail'),\Config::get('services'));
-        $send = $controller->laravelMail($username, $name, $subject, $data, [], []);
+        $send = $controller->laravelMail($address, $name, $subject, $data, [], []);
 
         return $send;
     }
 
-    public function setMailConfig($driver, $username, $name, $password, $enc, $host, $port)
+    public function setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port)
     {
         $configs = [
             'username'   => $username,
-            'from'       => ['address' => $username, 'name' => $name],
+            'from'       => ['address' => $address, 'name' => $name],
             'password'   => $password,
             'encryption' => $enc,
             'host'       => $host,
@@ -456,7 +459,7 @@ class EmailsController extends Controller
         $service = $request->input('fetching_protocol');
         $encryption = $request->input('fetching_encryption');
         $validate = $request->input('imap_validate');
-        $username = $request->input('email_address');
+        $username = $request->input('user_name');
         $password = $request->input('password');
         $server = new Fetch($host, $port, $service);
         //$server->setFlag('novalidate-cert');
@@ -510,7 +513,7 @@ class EmailsController extends Controller
             $mail->isSMTP();
             $mail->Host = $request->input('sending_host');            // Specify main and backup SMTP servers
             //$mail->SMTPAuth = true;                                   // Enable SMTP authentication
-            $mail->Username = $request->input('email_address');       // SMTP username
+            $mail->Username = $request->input('user_name');       // SMTP username
             $mail->Password = $request->input('password');            // SMTP password
             $mail->SMTPSecure = $request->input('sending_encryption'); // Enable TLS encryption, `ssl` also accepted
             $mail->Port = $request->input('sending_port');            // TCP port to connect to
diff --git a/app/Http/Requests/helpdesk/EmailsEditRequest.php b/app/Http/Requests/helpdesk/EmailsEditRequest.php
index 5f6e9ef3a..afc47cd09 100644
--- a/app/Http/Requests/helpdesk/EmailsEditRequest.php
+++ b/app/Http/Requests/helpdesk/EmailsEditRequest.php
@@ -36,7 +36,7 @@ class EmailsEditRequest extends Request
             // 'help_topic' => 'required',
             // 'imap_config' => 'required',
             'password' => 'required|min:6',
-            // 'user_name' => 'required',
+            'user_name' => 'required',
             // 'sending_host' => 'required',
             // 'sending_port' => 'required',
             //'mailbox_protocol'	=>		'required'
diff --git a/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
index a567d601b..eb2c18343 100644
--- a/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
@@ -46,19 +46,25 @@ class="active"
     <div class="box-body">
         <div class="row">
             <!-- email address -->
-            <div class="col-xs-4 form-group {{ $errors->has('email_address') ? 'has-error' : '' }}" id="email_address_error">
+            <div class="col-xs-6 form-group {{ $errors->has('email_address') ? 'has-error' : '' }}" id="email_address_error">
                 {!! Form::label('email_address',Lang::get('lang.email_address')) !!} <span class="text-red"> *</span>
                 {!! $errors->first('email_address', '<spam class="help-block">:message</spam>') !!}
                 {!! Form::text('email_address',null,['class' => 'form-control']) !!}
             </div>
+            <!-- user name -->
+            <div class="col-xs-6 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}" id="user_name_error">
+                {!! Form::label('user_name',Lang::get('lang.user_name')) !!} <span class="text-red"> *</span>
+                {!! $errors->first('user_name', '<spam class="help-block">:message</spam>') !!}
+                {!! Form::text('user_name',null,['class' => 'form-control']) !!}
+            </div>
             <!-- Email name -->
-            <div class="col-xs-4 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
+            <div class="col-xs-6 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
                 {!! Form::label('email_name',Lang::get('lang.from_name')) !!} <span class="text-red"> *</span>
                 {!! $errors->first('email_name', '<spam class="help-block">:message</spam>') !!}
                 {!! Form::text('email_name',null,['class' => 'form-control', 'id' => 'email_name']) !!}
             </div>
             <!-- password -->
-            <div class="col-xs-4 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
+            <div class="col-xs-6 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
                 {!! Form::label('password',Lang::get('lang.password')) !!} <span class="text-red"> *</span>
                 {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!}
                 <input type="password" name="password" class="form-control" id="password" value={!! $emails->password !!} >