An error has occured - please contact wm@ztlartcc.org
'; + $error_html = 'An error has occured - please contact ' . config('artcc.email_wm') . '
'; if (!$award) { return pdf()->html($error_html)->download(); } diff --git a/app/Http/Controllers/TrainingDash.php b/app/Http/Controllers/TrainingDash.php index 3de4f781b..0a5b60b52 100644 --- a/app/Http/Controllers/TrainingDash.php +++ b/app/Http/Controllers/TrainingDash.php @@ -423,11 +423,11 @@ public function addStudentComments(Request $request, $id) { $ticket->student_comments = $request->student_comments; $ticket->save(); - $mailer = Mail::to('ta@ztlartcc.org'); + $mailer = Mail::to(config('artcc.email_ta')); $trainer = User::find($ticket->trainer_id); if ($trainer) { if ($trainer->user_status[$trainer->status] == 'Active' && $trainer->isAbleTo('train')) { - $mailer = Mail::to($trainer->email)->cc('training@ztlartcc.org'); + $mailer = Mail::to($trainer->email)->cc(config('artcc.email_training')); } } $mailer->send(new StudentComment($trainer->full_name, $ticket->id)); @@ -524,7 +524,7 @@ public function assignRecommendation(Request $request, $id) { $ins = User::find($ots->ins_id); $controller = User::find($ots->controller_id); - Mail::to($ins->email)->cc('training@ztlartcc.org')->send(new OtsAssignment($ots, $controller, $ins)); + Mail::to($ins->email)->cc(config('artcc.email_training'))->send(new OtsAssignment($ots, $controller, $ins)); Audit::newAudit(' assigned an OTS for ' . User::find($ots->controller_id)->full_name . ' to ' . User::find($ots->ins_id)->full_name . '.'); @@ -696,7 +696,7 @@ public static function generateTrainingStats($year, $month, $dataType) { $trainerStats['S3'] = $trainerSesh->whereIn('position', $position_types_by_rating['S3'])->count(); $trainerStats['C1'] = $trainerSesh->whereIn('position', $position_types_by_rating['C1'])->count(); $trainerStats['Other'] = $trainerSesh->whereIn('position', $position_types_by_rating['OTHER'])->count(); - if ($trainerStats['total'] < Config::get('ztl.trainer_min_sessions')) { + if ($trainerStats['total'] < Config::get('artcc.trainer_min_sessions')) { $trainingStaffBelowMins++; } $trainerSessions[] = $trainerStats; @@ -903,7 +903,7 @@ private function saveNewTicket(Request $request, $id) { $controller = User::find($ticket->controller_id); $trainer = User::find($ticket->trainer_id); - Mail::to($controller->email)->cc('training@ztlartcc.org')->send(new TrainingTicketMail($ticket, $controller, $trainer)); + Mail::to($controller->email)->cc(config('artcc.email_training'))->send(new TrainingTicketMail($ticket, $controller, $trainer)); if ($request->ots == 1) { $ots = new Ots; diff --git a/app/Livewire/TaStatsMonthly.php b/app/Livewire/TaStatsMonthly.php index ddbeef1b6..ee4b35d4a 100644 --- a/app/Livewire/TaStatsMonthly.php +++ b/app/Livewire/TaStatsMonthly.php @@ -44,7 +44,7 @@ public function render() { $this->dispatch('changeSelectedMonth', inclusive_dates: $this->inclusive_dates, graph_data: $this->graph_data); $this->skipRender(); } - $this->trainer_min_sessions = Config::get('ztl.trainer_min_sessions'); + $this->trainer_min_sessions = Config::get('trainer.trainer_min_sessions'); $this->lookback_months(); return view('livewire.ta-stats-monthly'); } diff --git a/app/Mail/PilotPassportMail.php b/app/Mail/PilotPassportMail.php index f9ade11d0..773992dfd 100644 --- a/app/Mail/PilotPassportMail.php +++ b/app/Mail/PilotPassportMail.php @@ -33,7 +33,7 @@ public function envelope(): Envelope { return new Envelope( from: new ZTLAddress('events', 'vZTL ARTCC Events Department'), replyTo: [ - new Address('wm@ztlartcc.org', 'vZTL ARTCC WM') + new Address(config('artcc.email_wm'), 'vZTL ARTCC WM') ], subject: $this::$SUBJECTS[$this->type] ); diff --git a/app/Mail/VisitorMail.php b/app/Mail/VisitorMail.php index 020335d09..c207b277f 100644 --- a/app/Mail/VisitorMail.php +++ b/app/Mail/VisitorMail.php @@ -31,7 +31,7 @@ public function __construct(public $type, public $visitor) { * Get the message envelope. */ public function envelope(): Envelope { - $datm = new Address('datm@ztlartcc.org', 'vZTL ARTCC DATM'); + $datm = new Address(config('artcc.email_datm'), 'vZTL ARTCC DATM'); return new Envelope( from: new ZTLAddress('visitors', 'vZTL ARTCC Visiting Department'), replyTo: [ $datm ], diff --git a/config/artcc.php b/config/artcc.php new file mode 100644 index 000000000..2a1511b35 --- /dev/null +++ b/config/artcc.php @@ -0,0 +1,52 @@ + env('ARTCC_ID', 'ZTL'), + // Facility short name + 'short_name' => env('ARTCC_SHORT_NAME', 'vZTL'), + 'long_name' => env('ARTCC_LONG_NAME', 'Atlanta ARTCC'), + + // Set staff email addresses (used in staff view and email templates) + 'email_atm' => env('ARTCC_EMAIL_ATM', 'atm@ztlartcc.org'), + 'email_datm' => env('ARTCC_EMAIL_DATM', 'datm@ztlartcc.org'), + 'email_ta' => env('ARTCC_EMAIL_TA', 'ta@ztlartcc.org'), + 'email_ec' => env('ARTCC_EMAIL_EC', 'ec@ztlartcc.org'), + 'email_fe' => env('ARTCC_EMAIL_FE', 'fe@ztlartcc.org'), + 'email_wm' => env('ARTCC_EMAIL_WM', 'wm@ztlartcc.org'), + 'email_test' =>env('ARTCC_EMAIL_TEST', 'test@ztlartcc.org'), + + // Training tickets are CC'd to this address + 'email_training' => env('ARTCC_EMAIL_TRAINING', 'training@ztlartcc.org'), + + // Placeholder email address for forms + 'email_placeholder' => env('ARTCC_EMAIL_PLACEHOLDER', 'example@ztlartcc.org'), + + // Merch store email + 'email_merch_store' => env('ARTCC_MERCH_STORE_EMAIL', 'datm@ztlartcc.org'), + + // Number of sessions training staff are required to provide per month + 'trainer_min_sessions' => env('ZTL_TRAINER_MONTHLY_SESSIONS', 3), + + // Solo cert facilities (3-letter ID) + 'solo_twr' => env('ARTCC_SOLO_TWR', 'BHM'), + 'solo_app' => env('ARTCC_SOLO_APP', 'BHM'), + 'solo_ctr' => env('ARTCC_SOLO_CTR', 'ZTL'), + + // Teamspeak (adds teamspeak info views and links) + 'teamspeak' => env('ARTCC_TS', true), + 'teamspeak_server' => env('ARTCC_TS_SERVER', 'ts.ztlartcc.org'), + 'teamspeak_port' => env('ARTCC_TS_PORT', '9987'), + + // IDS Link (adds a link for IDS to the sidebar nav menu) + 'ids' => env('ARTCC_IDS', true), + 'ids_name' => env('ARTCC_IDS_NAME', 'vIDS'), + 'ids_link' => env('ARTCC_IDS_LINK', 'https://ids.ztlartcc.org'), + +]; diff --git a/config/ztl.php b/config/ztl.php deleted file mode 100644 index 0020bc489..000000000 --- a/config/ztl.php +++ /dev/null @@ -1,6 +0,0 @@ - env('ZTL_TRAINER_MONTHLY_SESSIONS', 3), - 'merch_store_email' => env('ZTL_MERCH_STORE_EMAIL', 'datm@ztlartcc.org'), -]; diff --git a/resources/views/dashboard/admin/email/send.blade.php b/resources/views/dashboard/admin/email/send.blade.php index 7ff128392..772f2bf5f 100644 --- a/resources/views/dashboard/admin/email/send.blade.php +++ b/resources/views/dashboard/admin/email/send.blade.php @@ -25,7 +25,7 @@Please note that opting out of broadcast emails will only prevent you from receiving broadcast emails issued from staff. Personalized emails (both automated and issued by staff) will not be affected. If you have any questions, please contact the ATM at atm@ztlartcc.org.
+Please note that opting out of broadcast emails will only prevent you from receiving broadcast emails issued from staff. Personalized emails (both automated and issued by staff) will not be affected. If you have any questions, please contact the ATM at config('artcc.email_atm').
Opting into emails will only affect the recieving of mass emails. If you elect to opt into emails, you agree to recieve mass emails sent to groups of members of the vZTL ARTCC. This selection will not affect the reception of personalized emails (both automated and issued by staff) for example, training ticket emails. If you have any questions, please contact the ATM at atm@ztlartcc.org.
+Opting into emails will only affect the recieving of mass emails. If you elect to opt into emails, you agree to recieve mass emails sent to groups of members of the vZTL ARTCC. This selection will not affect the reception of personalized emails (both automated and issued by staff) for example, training ticket emails. If you have any questions, please contact the ATM at {{config('artcc.email_atm')}}.
You may opt out at any time by using the slider shown on the profile page.
If you have any questions or concerns, please contact the events coordinator at ec@ztlartcc.org.
+If you have any questions or concerns, please contact the events coordinator at {{config('artcc.email_ec')}}.
Sincerely,
diff --git a/resources/views/emails/inactive/controller.blade.php b/resources/views/emails/inactive/controller.blade.php index 0cb81c2f1..ef26ea481 100644 --- a/resources/views/emails/inactive/controller.blade.php +++ b/resources/views/emails/inactive/controller.blade.php @@ -4,7 +4,7 @@Dear {{ $controller->full_name }},
You have not met the activity requirements within the last thirty days. As a certified controller, you are required to control, on the network, for at least 60 minutes every 30 days. You will have a 30 day grace period to meet this requirement, but after that you may be removed from the roster.
-If you have any questions or are on an LOA, please contact the DATM at datm@ztlartcc.org.
+If you have any questions or are on an LOA, please contact the DATM at {{config('artcc.email_datm')}}.
Sincerely,
vZTL ARTCC Staff
diff --git a/resources/views/emails/inactive/obs.blade.php b/resources/views/emails/inactive/obs.blade.php index bbcdb7d84..4d8715a3a 100644 --- a/resources/views/emails/inactive/obs.blade.php +++ b/resources/views/emails/inactive/obs.blade.php @@ -4,7 +4,7 @@Dear {{ $controller->full_name }},
You have not met the activity requirements within the last thirty days. As an observer, you are required to take part in at least 60 minutes of training each 30 days. You will have a 30 day grace period to meet this requirement, but after that you may be removed from the roster.
-If you have any questions or are on an LOA, please contact the DATM at datm@ztlartcc.org.
+If you have any questions or are on an LOA, please contact the DATM at {{config('artcc.email_datm')}}.
Sincerely,
vZTL ARTCC Staff
diff --git a/resources/views/emails/inactive/student.blade.php b/resources/views/emails/inactive/student.blade.php index 87abafeba..0bb9cce43 100644 --- a/resources/views/emails/inactive/student.blade.php +++ b/resources/views/emails/inactive/student.blade.php @@ -4,7 +4,7 @@Dear {{ $controller->full_name }},
You have not met the activity requirements within the last thirty days. As a student, you are required to take part in at least 60 minutes of training each 30 days. You will have a 30 day grace period to meet this requirement, but after that you may be removed from the roster.
-If you have any questions or are on an LOA, please contact the DATM at datm@ztlartcc.org.
+If you have any questions or are on an LOA, please contact the DATM at {{config('artcc.email_datm')}}.
Sincerely,
vZTL ARTCC Staff
diff --git a/resources/views/emails/new_feedback.blade.php b/resources/views/emails/new_feedback.blade.php index 0cc21b737..c73520f49 100644 --- a/resources/views/emails/new_feedback.blade.php +++ b/resources/views/emails/new_feedback.blade.php @@ -19,7 +19,7 @@ @endifIf you have any thoughts/comments, please email the DATM at datm@ztlartcc.org.
+If you have any thoughts/comments, please email the DATM at {{config('artcc.email_datm')}}.
Sincerely,
diff --git a/resources/views/emails/new_trainer_feedback.blade.php b/resources/views/emails/new_trainer_feedback.blade.php index 508b32931..580ac8867 100644 --- a/resources/views/emails/new_trainer_feedback.blade.php +++ b/resources/views/emails/new_trainer_feedback.blade.php @@ -20,7 +20,7 @@ @endifIf you have any thoughts/comments, please email the TA at ta@ztlartcc.org.
+If you have any thoughts/comments, please email the TA at {{config('artcc.email_ta')}}.
Sincerely,
diff --git a/resources/views/emails/ots_assignment.blade.php b/resources/views/emails/ots_assignment.blade.php index e2a006916..cbb0c0016 100644 --- a/resources/views/emails/ots_assignment.blade.php +++ b/resources/views/emails/ots_assignment.blade.php @@ -2,7 +2,7 @@ @section('content')Dear {{ $ins->fullname }},
-You have been assigned an OTS. The details are listed below. Please reply to this email, or email the controller separately in order to schedule the OTS exam. If you have any questions, please contact the TA at ta@ztlartcc.org.
+You have been assigned an OTS. The details are listed below. Please reply to this email, or email the controller separately in order to schedule the OTS exam. If you have any questions, please contact the TA at {{config('artcc.email_ta')}}.
Controller Name: {{ $ots->controller_name }}
Position: {{ $ots->position_name }}
diff --git a/resources/views/emails/pilot_passport/enroll.blade.php b/resources/views/emails/pilot_passport/enroll.blade.php index fd171bec0..2c7960d54 100644 --- a/resources/views/emails/pilot_passport/enroll.blade.php +++ b/resources/views/emails/pilot_passport/enroll.blade.php @@ -11,7 +11,7 @@ email confirmation with each qualifying visit (emails may be delayed up to 5 minutes).If you did not enroll in this program or otherwise believe this email to be in error, please contact us at: - wm@ztlartcc.org.
+ {{config('artcc.email_wm')}}.Thank you!
- vZTL Staff
If you did not enroll in this program or otherwise believe this email to be in error, please contact us at: - wm@ztlartcc.org.
+ {{config('artcc.email_wm')}}.Thank you!
- vZTL Staff
If you did not enroll in this program or otherwise believe this email to be in error, please contact us at: - wm@ztlartcc.org.
+ {{config('artcc.email_wm')}}.Thank you!
- vZTL Staff
Dear {{ $pilot->full_name }},
-This is an automated email to confirm that you have cancelled your assignment for Realops flight {{ $flight->flight_number }}. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to ec@ztlartcc.org.
+This is an automated email to confirm that you have cancelled your assignment for Realops flight {{ $flight->flight_number }}. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to {{config('artcc.email_ec')}}.
@endsection diff --git a/resources/views/emails/realops/flight_cancelled.blade.php b/resources/views/emails/realops/flight_cancelled.blade.php index b94a06c3c..c12ed0168 100644 --- a/resources/views/emails/realops/flight_cancelled.blade.php +++ b/resources/views/emails/realops/flight_cancelled.blade.php @@ -3,5 +3,5 @@ @section('content')Dear {{ $pilot->full_name }},
-This is an automated email to inform you that Realops flight {{ $flight_number }} has been cancelled. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to ec@ztlartcc.org.
+This is an automated email to inform you that Realops flight {{ $flight_number }} has been cancelled. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to {{config('artcc.email_ec')}}.
@endsection diff --git a/resources/views/emails/realops/removed_from_flight.blade.php b/resources/views/emails/realops/removed_from_flight.blade.php index d885a0028..9b1215070 100644 --- a/resources/views/emails/realops/removed_from_flight.blade.php +++ b/resources/views/emails/realops/removed_from_flight.blade.php @@ -3,5 +3,5 @@ @section('content')Dear {{ $pilot->full_name }},
-This is an automated email to inform you that you have been removed from Realops flight {{ $flight->flight_number }}. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to ec@ztlartcc.org.
+This is an automated email to inform you that you have been removed from Realops flight {{ $flight->flight_number }}. If you believe this is a mistake, you can rebid for the flight on the Realops Dashboard if bidding is still open, or you can send an email to {{config('artcc.email_ec')}}.
@endsection diff --git a/resources/views/emails/student_comment.blade.php b/resources/views/emails/student_comment.blade.php index 942922ab7..827ded5f3 100644 --- a/resources/views/emails/student_comment.blade.php +++ b/resources/views/emails/student_comment.blade.php @@ -6,7 +6,7 @@One of your students has entered a comment on their training ticket. You can view the comment here: Training Ticket.
If you have any thoughts/comments, please email the TA at ta@ztlartcc.org.
+If you have any thoughts/comments, please email the TA at {{config('artcc.email_ta')}}.
Sincerely,
diff --git a/resources/views/emails/training_reminder.blade.php b/resources/views/emails/training_reminder.blade.php index 5db9be8fd..984e24550 100644 --- a/resources/views/emails/training_reminder.blade.php +++ b/resources/views/emails/training_reminder.blade.php @@ -6,7 +6,7 @@This email is to remind you about your {{ $session_type }} appointment with {{ $trainer_full_name }} on {{ $appointment_date_time }}. As it is now within 24 hours, please contact your mentor directly to cancel or reschedule, or you may be marked a no-show.
This email is automated. If you believe you have received this email in error, please contact the ZTL Webmaster at wm@ztlartcc.org.
+This email is automated. If you believe you have received this email in error, please contact the ZTL Webmaster at {{config('artcc.email_wm')}}.
Sincerely,
diff --git a/resources/views/emails/training_ticket.blade.php b/resources/views/emails/training_ticket.blade.php index b4df1a941..07083631b 100644 --- a/resources/views/emails/training_ticket.blade.php +++ b/resources/views/emails/training_ticket.blade.php @@ -28,7 +28,7 @@If you would like to submit comments to be included in your training ticket, you can do that by going to https://www.ztlartcc.org/dashboard/controllers/ticket/{{ $ticket->id }} or by viewing the ticket from your profile page on the controller dashboard. Please note that these comments are viewable by all the training staff and once they are submitted, they cannot be changed.
-If you believe there are any errors, please contact the training administrator at ta@ztlartcc.org.
+If you believe there are any errors, please contact the training administrator at {{config('artcc.email_ta')}}.
Best regards,
ZTL Training Staff
diff --git a/resources/views/emails/visit/accept.blade.php b/resources/views/emails/visit/accept.blade.php index 338d56dda..1bec45f28 100644 --- a/resources/views/emails/visit/accept.blade.php +++ b/resources/views/emails/visit/accept.blade.php @@ -6,7 +6,7 @@You can find all the information for the various facilities within the ARTCC under the files page on the website, www.ztlartcc.org.
TeamSpeak 3 is used for all controller communications. The address for the server we use is ts.ztlartcc.org and there is no password.
Most visitors will be certified to control unrestricted fields through their current rating. It is highly recommended that you review the SOPs and LOAs located on the website prior to logging onto the network.
Once again, congratulations on being accepted as a visitor in Atlanta and we hope to see you on the network soon! If you have any questions, feel free to email the DATM at datm@ztlartcc.org.
Once again, congratulations on being accepted as a visitor in Atlanta and we hope to see you on the network soon! If you have any questions, feel free to email the DATM at {{config('artcc.email_datm')}}.
Best regards,
ZTL Staff
diff --git a/resources/views/emails/visit/new.blade.php b/resources/views/emails/visit/new.blade.php index c5167d388..b76772674 100644 --- a/resources/views/emails/visit/new.blade.php +++ b/resources/views/emails/visit/new.blade.php @@ -10,7 +10,7 @@ SOPs and LOAs that can be found on the ZTL Website. Some questions will ensure you understand the rules for being a member at ZTL. The answers to these questions can be found in our Facility Administrative Policy.You will have seven (7) days to complete the exams and you must pass each with a score of 80% or better. If you have any questions or - concerns, please email the DATM at datm@ztlartcc.org.
+ concerns, please email the DATM at {{config('artcc.email_datm')}}.Best regards,
ZTL Staff
@endsection diff --git a/resources/views/emails/visit/reject.blade.php b/resources/views/emails/visit/reject.blade.php index 2b7f106dc..89c86a7b4 100644 --- a/resources/views/emails/visit/reject.blade.php +++ b/resources/views/emails/visit/reject.blade.php @@ -5,7 +5,7 @@{!! nl2br(e($visitor->reject_reason)) !!}
-If you have any questions, please contact the DATM at datm@ztlartcc.org.
+If you have any questions, please contact the DATM at {{config('artcc.email_datm')}}.
Best regards,
diff --git a/resources/views/emails/visit/remove.blade.php b/resources/views/emails/visit/remove.blade.php index 4c5fa22db..05a8257a4 100644 --- a/resources/views/emails/visit/remove.blade.php +++ b/resources/views/emails/visit/remove.blade.php @@ -4,7 +4,7 @@Dear {{ $visitor->full_name }},
This email is to inform you that you have been removed from the ZTL Visiting Roster. The causes for removal can be found in ZTL ARTCC Facility Administrative Policy 7230.1B Chapter 3-5.
-If you are still unsure of the reason for your removal, please contact the DATM at datm@ztlartcc.org.
+If you are still unsure of the reason for your removal, please contact the DATM at {{config('artcc.email_datm')}}.
Sincerely,
vZTL ARTCC Staff
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index 2e8e081e2..2679ba02e 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -36,7 +36,7 @@ function safeErrorMessage($exception) {{{ safeErrorMessage($exception) }}
diff --git a/resources/views/layouts/email.blade.php b/resources/views/layouts/email.blade.php index 2a23709e1..0a7fb3020 100644 --- a/resources/views/layouts/email.blade.php +++ b/resources/views/layouts/email.blade.php @@ -8,6 +8,6 @@ ---------- @yield('footer')For entertainment purposes only. Do not use for real world purposes. Part of the VATSIM Network.
-If you believe that you have received this email in error, please contact the vZTL ARTCC Webmaster at wm@ztlartcc.org.
+If you believe that you have received this email in error, please contact the vZTL ARTCC Webmaster at {{config('artcc.email_wm')}}.