Fixes #4036 - adds test email button to general settings

2017-10-19 08:18:56 -07:00
parent cb50142ba3
commit cd193ce8bb
5 changed files with 107 additions and 31 deletions
@@ -21,6 +21,7 @@ use App\Models\User;
 use App\Http\Requests\SetupUserRequest;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsLdapRequest;
+use App\Helpers\Helper;

 /**
 * This controller handles all actions related to Settings for
@@ -1020,9 +1021,9 @@ class SettingsController extends Controller
                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
                $m->subject(trans('mail.test_email'));
            });
-            return response()->json(['message' => 'Mail sent! '], 200);
+            return response()->json(Helper::formatStandardApiResponse('success', null, 'Maiol sent!'));
        } catch (Exception $e) {
-            return response()->json(['message' => $e->getMessage()], 500);
+            return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
        }

    }