diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 5bb5d393246ede7266440c30a7e9f5e41df8cc8e..cc91ffdf804fce3dad988a6e11139a1b259d60c8 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -1,102 +1,177 @@
+<h2>Alerts and Notices</h2>
<form action="settings.php?t=alerts" method="post" id="save">
<?php csrf_token(); ?>
<input type="hidden" name="t" value="alerts" >
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
- <th colspan="2">
- <h4>Alerts and Notices Setting</h4>
- <em>Alerts sent to staff on ticket "events". Staff assignment takes precedence over team assignment.</em>
+ <th>
+ <h4>Alerts and Notices sent to staff on ticket "events"</h4>
</th>
</tr>
</thead>
<tbody>
+ <tr><th><em><b>New Ticket Alert</b>: Alert sent out on new tickets</em></th></tr>
<tr>
- <td width="160">New Ticket Alert:</td>
- <td>
+ <td><em><b>Status:</b></em>
<input type="radio" name="ticket_alert_active" value="1" <?php echo $config['ticket_alert_active']?'checked':''; ?> />Enable
<input type="radio" name="ticket_alert_active" value="0" <?php echo !$config['ticket_alert_active']?'checked':''; ?> />Disable
- <em>Alert sent out on new tickets <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
- <input type="checkbox" name="ticket_alert_admin" <?php echo $config['ticket_alert_admin']?'checked':''; ?>> Admin Email
+ <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="checkbox" name="ticket_alert_admin" <?php echo $config['ticket_alert_admin']?'checked':''; ?>> Admin Email <em>(<?php echo $cfg->getAdminEmail(); ?>)</em>
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="ticket_alert_dept_manager" <?php echo $config['ticket_alert_dept_manager']?'checked':''; ?>> Department Manager
- <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members (spammy)
</td>
</tr>
<tr>
- <td width="160">New Message Alert:</td>
<td>
+ <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>New Message Alert</b>: Alert sent out when a new message, from the user, is appended to an existing ticket</em></th></tr>
+ <tr>
+ <td><em><b>Status:</b></em>
<input type="radio" name="message_alert_active" value="1" <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
+
<input type="radio" name="message_alert_active" value="0" <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
- <em>Alert sent out when a new message is appended to an existing ticket <font class="error"> <?php echo $errors['message_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff
- <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager (spammy)
</td>
</tr>
<tr>
- <td width="160">New Internal Note Alert:</td>
<td>
+ <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>New Internal Note Alert</b>: Alert sent out when a new internal note is posted.</em></th></tr>
+ <tr>
+ <td><em><b>Status:</b></em>
<input type="radio" name="note_alert_active" value="1" <?php echo $config['note_alert_active']?'checked':''; ?> />Enable
+
<input type="radio" name="note_alert_active" value="0" <?php echo !$config['note_alert_active']?'checked':''; ?> />Disable
- <em>Alert sent out when a new internal note is posted <font class="error"> <?php echo $errors['note_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
+ <font class="error"> <?php echo $errors['note_alert_active']; ?></font>
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="note_alert_laststaff" <?php echo $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff
- <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager (spammy)
</td>
</tr>
<tr>
- <td width="160">Ticket Assignment Alert:</td>
<td>
+ <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>Ticket Assignment Alert</b>: Alert sent out to staff on ticket assignment.</em></th></tr>
+ <tr>
+ <td><em><b>Status: </b></em>
<input name="assigned_alert_active" value="1" checked="checked" type="radio">Enable
+
<input name="assigned_alert_active" value="0" type="radio">Disable
- <em>Alert sent out to staff on ticket assignment <font class="error"> <?php echo $errors['assigned_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
+ <font class="error"> <?php echo $errors['assigned_alert_active']; ?></font>
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff
- <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead (Team assignment)
- <input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
- Team Members (spammy)
</td>
</tr>
<tr>
- <td width="160">Ticket Transfer Alert:</td>
<td>
+ <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
+ Team Members <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>Ticket Transfer Alert</b>: Alert sent out to staff of the target department on ticket transfer.</em></th></tr>
+ <tr>
+ <td><em><b>Status:</b></em>
<input type="radio" name="transfer_alert_active" value="1" <?php echo $config['transfer_alert_active']?'checked':''; ?> />Enable
<input type="radio" name="transfer_alert_active" value="0" <?php echo !$config['transfer_alert_active']?'checked':''; ?> />Disable
- <em>Alert sent out to staff on ticket transfer <font class="error">
-<?php echo $errors['alert_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
+ <font class="error"> <?php echo $errors['alert_alert_active']; ?></font>
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager
- <input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>> Department Members
- (spammy)
</td>
</tr>
<tr>
- <td width="160">Overdue Ticket Alert:</td>
<td>
+ <input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>>
+ Department Members <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>Overdue Ticket Alert</b>: Alert sent out when a ticket becomes overdue - admin email gets an alert by default.</em></th></tr>
+ <tr>
+ <td><em><b>Status:</b></em>
<input type="radio" name="overdue_alert_active" value="1" <?php echo $config['overdue_alert_active']?'checked':''; ?> />Enable
<input type="radio" name="overdue_alert_active" value="0" <?php echo !$config['overdue_alert_active']?'checked':''; ?> />Disable
- <em>Alert sent out when a ticket becomes overdue - admin email gets an alert by default. <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font></em><br>
- <strong>Recipients</strong>:
+ <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font>
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager
- <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members (spammy)
</td>
</tr>
<tr>
- <td width="160">System Alerts:</td>
- <td><em><b>Enabled</b>: Errors are sent to system admin email (<?php echo $cfg->getAdminEmail(); ?>)</em><br>
+ <td>
+ <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+ </td>
+ </tr>
+ <tr><th><em><b>System Alerts</b>: Enabled by default. Errors are sent to system admin email (<?php echo $cfg->getAdminEmail(); ?>)</em></th></tr>
+ <tr>
+ <td>
<input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>>SQL errors
+ </td>
+ </tr>
+ <tr>
+ <td>
<input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts
</td>
</tr>
</tbody>
</table>
-<p style="padding-left:200px;">
+<p style="padding-left:350px;">
<input class="button" type="submit" name="submit" value="Save Changes">
<input class="button" type="reset" name="reset" value="Reset Changes">
</p>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index fecd3ab3fca43d5d7c8c1985c0668c991ecdd3f7..f8674095d49cfe25102ef682e64bb9df59e1614a 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -67,7 +67,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?> > Enable POP/IMAP polling
<input type="checkbox" name="enable_auto_cron" <?php echo $config['enable_auto_cron']?'checked="checked"':''; ?>>
- Enable Auto-Cron <em>(Poll emails based on staff activity - NOT recommended)</em>
+ Enable Auto-Cron <em>(Poll based on staff activity - NOT recommended)</em>
</td>
</tr>
<tr>