From b7200fee947fa680e303cf7e7cfade757803e181 Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@donatello.local>
Date: Wed, 10 Apr 2013 05:00:48 -0400
Subject: [PATCH 1/6] Add <label> tags

Added <label> tags around a couple of elements that were lacking them
on the open ticket page. Makes elements easier to click (and adds
consistency).
---
 include/staff/ticket-open.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index ed29b873..63b30f4f 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -30,7 +30,9 @@
             <?php 
             if($cfg->notifyONNewStaffTicket()) { ?>
                &nbsp;&nbsp;&nbsp;
-               <input type="checkbox" name="alertuser" <?php echo (!$errors || $info['alertuser'])? 'checked="checked"': ''; ?>>Send alert to user.
+               <label>
+               	<input type="checkbox" name="alertuser" <?php echo (!$errors || $info['alertuser'])? 'checked="checked"': ''; ?>>Send alert to user.
+               </label>
             <?php 
              } ?>
             </td>
@@ -282,8 +284,10 @@
                 <tr>
                     <td width="100">Ticket Status:</td>
                     <td>
-                        <input type="checkbox" name="ticket_state" value="closed" <?php echo $info['ticket_state']?'checked="checked"':''; ?>>
-                        <b>Close On Response</b>&nbsp;<em>(Only applicable if response is entered)</em>
+                    	<label>
+                        	<input type="checkbox" name="ticket_state" value="closed" <?php echo $info['ticket_state']?'checked="checked"':''; ?>>
+                        	<b>Close On Response</b>&nbsp;<em>(Only applicable if response is entered)</em>
+                        </label>
                     </td>
                 </tr>
             <?php

From 462be35a82acd72c77a51d2f7569f4c9556c5d41 Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@donatello.local>
Date: Wed, 10 Apr 2013 06:35:43 -0400
Subject: [PATCH 2/6] Added <label> tags to all Settings tab subtabs

osTicket would benefit <label>s across the board. I created a regex for
it, but it was still slow going due to the expected formatting
irregularities and the like, so I just did the settings subtabs.
---
 include/staff/settings-alerts.inc.php   | 424 ++++++++++++++----------
 include/staff/settings-autoresp.inc.php |  16 +
 include/staff/settings-emails.inc.php   |  12 +-
 include/staff/settings-kb.inc.php       |  10 +-
 include/staff/settings-system.inc.php   |   8 +
 include/staff/settings-tickets.inc.php  |  47 ++-
 6 files changed, 331 insertions(+), 186 deletions(-)

diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index cc91ffdf..9ca9d6db 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -1,178 +1,246 @@
-<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>
-                <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><em><b>Status:</b></em> &nbsp;
-                <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
-                &nbsp;&nbsp;<font class="error">&nbsp;<?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
-            </td>
-        </tr>
-        <tr>
-            <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> &nbsp; 
-              <input type="radio" name="message_alert_active"  value="1"   <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
-              &nbsp;&nbsp;
-              <input type="radio" name="message_alert_active"  value="0"   <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
-            </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
-            </td>
-        </tr>
-        <tr>
-            <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> &nbsp;
-              <input type="radio" name="note_alert_active"  value="1"   <?php echo $config['note_alert_active']?'checked':''; ?> />Enable
-              &nbsp;&nbsp;
-              <input type="radio" name="note_alert_active"  value="0"   <?php echo !$config['note_alert_active']?'checked':''; ?> />Disable
-              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?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
-            </td>
-        </tr>
-        <tr>
-            <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> &nbsp;
-              <input name="assigned_alert_active" value="1" checked="checked" type="radio">Enable
-              &nbsp;&nbsp;
-              <input name="assigned_alert_active" value="0" type="radio">Disable
-               &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?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
-            </td>
-        </tr>
-        <tr>
-            <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> &nbsp;
-              <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
-              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?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
-            </td>
-        </tr>
-        <tr>
-            <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> &nbsp;
-              <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
-              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?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
-            </td>
-        </tr>
-        <tr>
-            <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:350px;">
-    <input class="button" type="submit" name="submit" value="Save Changes">
-    <input class="button" type="reset" name="reset" value="Reset Changes">
-</p>
-</form>
+<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>
+                <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><em><b>Status:</b></em> &nbsp;
+                <label>
+                <input type="radio" name="ticket_alert_active"  value="1"   <?php echo $config['ticket_alert_active']?'checked':''; ?> />Enable
+                </label>
+                <label>
+                <input type="radio" name="ticket_alert_active"  value="0"   <?php echo !$config['ticket_alert_active']?'checked':''; ?> />Disable
+                </label>
+                &nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['ticket_alert_active']; ?></font></em>
+             </td>
+        </tr>
+        <tr>
+            <td>
+            	<label>
+                <input type="checkbox" name="ticket_alert_admin" <?php echo $config['ticket_alert_admin']?'checked':''; ?>> Admin Email
+                 <em>(<?php echo $cfg->getAdminEmail(); ?>)</em>
+                 </label>
+            </td>
+        </tr>
+        <tr>    
+            <td>
+                <label>
+                <input type="checkbox" name="ticket_alert_dept_manager" <?php echo $config['ticket_alert_dept_manager']?'checked':''; ?>> Department Manager
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>
+                <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members 
+                <em>(spammy)</em>
+                </label>
+            </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> &nbsp; 
+              <label>
+              <input type="radio" name="message_alert_active"  value="1"   <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
+              </label>
+              &nbsp;&nbsp;
+              <label>
+              <input type="radio" name="message_alert_active"  value="0"   <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+              </label>
+            </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> &nbsp;
+              <label>
+              <input type="radio" name="note_alert_active"  value="1"   <?php echo $config['note_alert_active']?'checked':''; ?> />Enable
+              </label>
+              &nbsp;&nbsp;
+              <label>
+              <input type="radio" name="note_alert_active"  value="0"   <?php echo !$config['note_alert_active']?'checked':''; ?> />Disable
+              </label>
+              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['note_alert_active']; ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="note_alert_laststaff" <?php echo $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+              </label>
+            </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> &nbsp;
+              <label>
+              <input type="radio" name="assigned_alert_active" value="1" checked="checked">Enable
+              </label>
+              &nbsp;&nbsp;
+              <label>
+              <input type="radio" name="assigned_alert_active" value="0">Disable
+              </label>
+               &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['assigned_alert_active']; ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em>
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
+                Team Members <em>(spammy)</em>
+              </label>
+            </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> &nbsp;
+              <label>
+              <input type="radio" name="transfer_alert_active"  value="1"   <?php echo $config['transfer_alert_active']?'checked':''; ?> />Enable
+              </label>
+              <label>
+              <input type="radio" name="transfer_alert_active"  value="0"   <?php echo !$config['transfer_alert_active']?'checked':''; ?> />Disable
+              </label>
+              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['alert_alert_active']; ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>>
+                Department Members <em>(spammy)</em>
+              </label>
+            </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> &nbsp;
+              <label>
+              <input type="radio" name="overdue_alert_active"  value="1"   <?php echo $config['overdue_alert_active']?'checked':''; ?> />Enable
+              </label>
+              <label>
+              <input type="radio" name="overdue_alert_active"  value="0"   <?php echo !$config['overdue_alert_active']?'checked':''; ?> />Disable
+              </label>
+              &nbsp;&nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['overdue_alert_active']; ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+              </label>
+            </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>
+              <label>
+              <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>>SQL errors
+              </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <label>
+              <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts
+              </label>
+            </td>
+        </tr>
+    </tbody>
+</table>
+<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>
+</form>
diff --git a/include/staff/settings-autoresp.inc.php b/include/staff/settings-autoresp.inc.php
index b5815915..9f00fb10 100644
--- a/include/staff/settings-autoresp.inc.php
+++ b/include/staff/settings-autoresp.inc.php
@@ -16,8 +16,12 @@
         <tr>
             <td width="160">New Ticket:</td>
             <td>
+            	<label>
                 <input type="radio" name="ticket_autoresponder"  value="1"   <?php echo $config['ticket_autoresponder']?'checked="checked"':''; ?> /><b>Enable</b>
+                </label>
+                <label>
                 <input type="radio" name="ticket_autoresponder"  value="0"   <?php echo !$config['ticket_autoresponder']?'checked="checked"':''; ?> />Disable
+                </label>
                 &nbsp;&nbsp;&nbsp;
                 <em>(Autoresponse includes the ticket ID required to check status of the ticket)</em>
             </td>
@@ -25,8 +29,12 @@
         <tr>
             <td width="160">New Ticket by staff:</td>
             <td>
+            	<label>
                 <input type="radio" name="ticket_notice_active"  value="1"   <?php echo $config['ticket_notice_active']?'checked="checked"':''; ?> /><b>Enable</b>
+                </label>
+                <label>
                 <input type="radio" name="ticket_notice_active"  value="0"   <?php echo !$config['ticket_notice_active']?'checked="checked"':''; ?> />Disable
+				</label>
                  &nbsp;&nbsp;&nbsp;
                  <em>(Notice sent when staff creates a ticket on behalf of the user (Staff can overwrite))</em>
             </td>
@@ -34,8 +42,12 @@
         <tr>
             <td width="160">New Message:</td>
             <td>
+            	<label>
                 <input type="radio" name="message_autoresponder"  value="1"   <?php echo $config['message_autoresponder']?'checked="checked"':''; ?> /><b>Enable</b>
+				</label>
+				<label>
                 <input type="radio" name="message_autoresponder"  value="0"   <?php echo !$config['message_autoresponder']?'checked="checked"':''; ?> />Disable
+                </label>
                 &nbsp;&nbsp;&nbsp;
                 <em>(Confirmation notice sent when a new message is appended to an existing ticket)</em>
             </td>
@@ -43,8 +55,12 @@
         <tr>
             <td width="160">Overlimit notice:</td>
             <td>
+            	<label>
                 <input type="radio" name="overlimit_notice_active"  value="1"   <?php echo $config['overlimit_notice_active']?'checked="checked"':''; ?> /><b>Enable</b>
+				</label>
+				<label>
                 <input type="radio" name="overlimit_notice_active"  value="0"   <?php echo !$config['overlimit_notice_active']?'checked="checked"':''; ?> />Disable
+				</label>
                 &nbsp;&nbsp;&nbsp;
                 <em>(Ticket denied notice sent to user on limit violation. Admin gets alerts on ALL denials by default)</em>
             </td>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index b7175a06..674cb7e4 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -64,17 +64,25 @@
         <tr><th colspan=2><em><strong>Incoming Emails</strong>: For mail fetcher (polling) to work you must set an external cron job or enable auto-cron polling</em></th>
         <tr>
             <td width="180">Email Polling:</td>
-            <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?>  > Enable POP/IMAP polling
+            <td>
+            <label>
+            <input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?>  > Enable POP/IMAP polling
+            </label>
                  &nbsp;&nbsp;
+				 <label>
                  <input type="checkbox" name="enable_auto_cron" <?php echo $config['enable_auto_cron']?'checked="checked"':''; ?>>
-                 Poll on auto-cron <em>(Poll based on staff activity - NOT recommended)</em>
+                 Poll on auto-cron
+                 </label>
+                  <em>(Poll based on staff activity - NOT recommended)</em>
             </td>
         </tr>
         <tr>
             <td width="180">Strip Quoted Reply:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="strip_quoted_reply" <?php echo $config['strip_quoted_reply'] ? 'checked="checked"':''; ?>>
                 <em>(depends on the reply separator tag set below)</em>
+                </label>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['strip_quoted_reply']; ?></font>
             </td>
         </tr>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index 726c822f..bcd5befb 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -18,16 +18,22 @@
         <tr>
             <td width="180">Knowledge base status:</td>
             <td>
+        	  <label>
               <input type="checkbox" name="enable_kb" value="1" <?php echo $config['enable_kb']?'checked="checked"':''; ?>>
-              Enable Knowledge base&nbsp;<em>(Client interface)</em>
+              Enable Knowledge base
+              &nbsp;<em>(Client interface)</em>
+              </label>
               &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_kb']; ?></font>
             </td>
         </tr>
         <tr>
             <td width="180">Canned Responses:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="enable_premade" value="1" <?php echo $config['enable_premade']?'checked="checked"':''; ?> >
-                Enable canned responses&nbsp;<em>(Available on ticket reply)</em>
+                Enable canned responses
+                &nbsp;<em>(Available on ticket reply)</em>
+                </label>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_premade']; ?></font>
             </td>
         </tr>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 3fba7f15..04b31c7f 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -21,8 +21,12 @@
         <tr>
             <td width="220" class="required">Helpdesk Status:</td>
             <td>
+            	<label>
                 <input type="radio" name="isonline"  value="1"   <?php echo $config['isonline']?'checked="checked"':''; ?> /><b>Online</b> (Active)
+                </label>
+                <label>
                 <input type="radio" name="isonline"  value="0"   <?php echo !$config['isonline']?'checked="checked"':''; ?> /><b>Offline</b> (Disabled)
+                <label>
                 &nbsp;<font class="error">&nbsp;<?php echo $config['isoffline']?'osTicket offline':''; ?></font>
             </td>
         </tr>
@@ -128,8 +132,10 @@
         </tr>
         <tr><td>Bind Staff Session to IP:</td>
             <td>
+              <label>
               <input type="checkbox" name="staff_ip_binding" <?php echo $config['staff_ip_binding']?'checked="checked"':''; ?>>
               <em>(binds staff session to originating IP address upon login)</em>
+              <label>
             </td>
         </tr>
         <tr><td>Staff Excessive Logins:</td>
@@ -231,7 +237,9 @@
         <tr>
             <td width="220">Daylight Saving:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="enable_daylight_saving" <?php echo $config['enable_daylight_saving'] ? 'checked="checked"': ''; ?>>Observe daylight savings
+                <label>
             </td>
         </tr>
     </tbody>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 4d3f47f6..12cf23b4 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -19,10 +19,14 @@
     <tbody>
         <tr><td width="220" class="required">Ticket IDs:</td>
             <td>
+            	<label>
                 <input type="radio" name="random_ticket_ids"  value="0" <?php echo !$config['random_ticket_ids']?'checked="checked"':''; ?> />
                 Sequential
+                </label>
+                <label>
                 <input type="radio" name="random_ticket_ids"  value="1" <?php echo $config['random_ticket_ids']?'checked="checked"':''; ?> />
                 Random  <em>(highly recommended)</em>
+                </label>
             </td>
         </tr>
 
@@ -79,77 +83,100 @@
         <tr>
                     <td width="180">Web Tickets Priority:</td>
                     <td>
+                        <label>
                         <input type="checkbox" name="allow_priority_change" value="1" <?php echo $config['allow_priority_change'] ?'checked="checked"':''; ?>>
                         <em>(Allow user to overwrite/set priority)</em>
+                        </label>
                     </td>
                 </tr>
                 <tr>
                     <td width="180">Emailed Tickets Priority:</td>
                     <td>
+                        <label>
                         <input type="checkbox" name="use_email_priority" value="1" <?php echo $config['use_email_priority'] ?'checked="checked"':''; ?> >
                         <em>(Use email priority when available)</em>
+                        </label>
             </td>
         </tr>
         <tr>
             <td width="180">Show Related Tickets:</td>
             <td>
+                <label>
                 <input type="checkbox" name="show_related_tickets" value="1" <?php echo $config['show_related_tickets'] ?'checked="checked"':''; ?> >
                 <em>(Show all related tickets on user login - otherwise access is restricted to one ticket view per login)</em>
+                </label>
             </td>
         </tr>
         <tr>
             <td width="180">Show Notes Inline:</td>
             <td>
+                <label>
                 <input type="checkbox" name="show_notes_inline" value="1" <?php echo $config['show_notes_inline'] ?'checked="checked"':''; ?> >
-                <em>(Show internal notes  inline)</em>
+                <em>(Show internal notes inline)</em>
+                </label>
               </td>
         </tr>
         <tr><td>Clickable URLs:</td>
             <td>
+              <label>
               <input type="checkbox" name="clickable_urls" <?php echo $config['clickable_urls']?'checked="checked"':''; ?>>
                <em>(converts URLs in ticket thread to clickable links)</em>
+              </label>
             </td>
         </tr>
         <tr>
             <td>Human Verification:</td>
             <td>
+                <label>
                 <input type="checkbox" name="enable_captcha" <?php echo $config['enable_captcha']?'checked="checked"':''; ?>>
-                Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em> &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_captcha']; ?></font><br/>
+                Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em>
+                </label>
+                 &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_captcha']; ?></font><br/>
             </td>
         </tr>
         <tr>
             <td>Reopened Tickets:</td>
             <td>
+                <label>
                 <input type="checkbox" name="auto_assign_reopened_tickets" <?php echo $config['auto_assign_reopened_tickets']?'checked="checked"':''; ?>>
                 Auto-assign reopened tickets to the last available respondent.
+                </label>
             </td>
         </tr>
         <tr>
             <td>Assigned Tickets:</td>
             <td>
+                <label>
                 <input type="checkbox" name="show_assigned_tickets" <?php echo $config['show_assigned_tickets']?'checked="checked"':''; ?>>
                 Show assigned tickets on open queue.
+                </label>
             </td>
         </tr>
         <tr>
             <td>Answered Tickets:</td>
             <td>
+                <label>
                 <input type="checkbox" name="show_answered_tickets" <?php echo $config['show_answered_tickets']?'checked="checked"':''; ?>>
                 Show answered tickets on open queue.
+                </label>
             </td>
         </tr>
         <tr>
             <td>Ticket Activity Log:</td>
             <td>
+                <label>
                 <input type="checkbox" name="log_ticket_activity" <?php echo $config['log_ticket_activity']?'checked="checked"':''; ?>>
                 Log ticket activity as internal notes.
+                </label>
             </td>
         </tr>
         <tr>
             <td>Staff Identity Masking:</td>
             <td>
+                <label>
                 <input type="checkbox" name="hide_staff_name" <?php echo $config['hide_staff_name']?'checked="checked"':''; ?>>
                 Hide staff's name on responses.
+                </label>
             </td>
         </tr>
         <tr>
@@ -160,25 +187,35 @@
         <tr>
             <td width="180">Allow Attachments:</td>
             <td>
+              <label>
               <input type="checkbox" name="allow_attachments" <?php echo $config['allow_attachments']?'checked="checked"':''; ?>><b>Allow Attachments</b>
                 &nbsp; <em>(Global Setting)</em>
+              </label>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['allow_attachments']; ?></font>
             </td>
         </tr>
         <tr>
             <td width="180">Emailed/API Attachments:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="allow_email_attachments" <?php echo $config['allow_email_attachments']?'checked="checked"':''; ?>> Accept emailed/API attachments.
+                </label>
                     &nbsp;<font class="error">&nbsp;<?php echo $errors['allow_email_attachments']; ?></font>
             </td>
         </tr>
         <tr>
             <td width="180">Online/Web Attachments:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="allow_online_attachments" <?php echo $config['allow_online_attachments']?'checked="checked"':''; ?> >
-                    Allow web upload &nbsp;&nbsp;&nbsp;&nbsp;
+                    Allow web upload
+                    </label>
+                     &nbsp;&nbsp;&nbsp;&nbsp;
+            	<label>
                 <input type="checkbox" name="allow_online_attachments_onlogin" <?php echo $config['allow_online_attachments_onlogin'] ?'checked="checked"':''; ?> >
-                    Limit to authenticated users only. <em>(User must be logged in to upload files)</em>
+                    Limit to authenticated users only.
+                    </label>
+                     <em>(User must be logged in to upload files)</em>
                     <font class="error">&nbsp;<?php echo $errors['allow_online_attachments']; ?></font>
             </td>
         </tr>
@@ -225,7 +262,9 @@
         <tr>
             <td width="180">Ticket Response Files:</td>
             <td>
+            	<label>
                 <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> >Email attachments to the user
+				</label>
             </td>
         </tr>
         <tr>

From 3bddd6e8e8809833144825054818e6569820f82e Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@Splinter.local>
Date: Wed, 10 Apr 2013 16:06:02 -0400
Subject: [PATCH 3/6] Spelling, grammar and readability in upgrader documents

Tweaked spelling, grammar and wording to make the text of the upgrader
pages more readable.
---
 include/upgrader/aborted.inc.php |  2 +-
 include/upgrader/done.inc.php    |  4 ++--
 include/upgrader/prereq.inc.php  | 14 +++++++-------
 include/upgrader/rename.inc.php  |  2 +-
 include/upgrader/upgrade.inc.php |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/upgrader/aborted.inc.php b/include/upgrader/aborted.inc.php
index 44e065b1..8b8d8cbd 100644
--- a/include/upgrader/aborted.inc.php
+++ b/include/upgrader/aborted.inc.php
@@ -20,7 +20,7 @@
             echo '<b><font color="red">Internal error occurred - get technical help.</font></b>';
         }
         ?>
-        <p><b>For detailed - please view <a href="logs.php">system logs</a> or check your email.</b></p>
+        <p><b>For more detailed information, please view <a href="logs.php">system logs</a> or check your email.</b></p>
         <br>
         <p>Please, refer to the <a target="_blank" href="http://osticket.com/wiki/Upgrade_and_Migration">Upgrade Guide</a> on the wiki for more information.</p>
     </div>
diff --git a/include/upgrader/done.inc.php b/include/upgrader/done.inc.php
index f4a55538..1c01fb7c 100644
--- a/include/upgrader/done.inc.php
+++ b/include/upgrader/done.inc.php
@@ -7,7 +7,7 @@
     <div id="main">
         <h1 style="color:green;">Upgrade Completed!</h1>
         <div id="intro">
-        <p>Congratulations osTicket upgrade has been completed successfully.</p>
+        <p>Congratulations! osTicket upgrade has completed successfully.</p>
         <p>Please refer to <a href="http://osticket.com/wiki/Release_Notes" target="_blank">Release Notes</a> for more information about changes and/or new features.</p>
         </div>
         <p>Once again, thank you for choosing osTicket.</p>
@@ -20,7 +20,7 @@
     </div>
     <div id="sidebar">
             <h3>What's Next?</h3>
-            <p><b>Post-upgrade</b>: You can now go to <a href="scp/settings.php" target="_blank">Admin Panel</a> to enable the system and explore the new features. For complete and upto date release notes see <a href="http://osticket.com/wiki/Release_Notes" target="_blank">osTicket wiki</a></p>
+            <p><b>Post-upgrade</b>: You can now go to <a href="scp/settings.php" target="_blank">Admin Panel</a> to enable the system and explore the new features. For complete and up-to-date release notes, see <a href="http://osticket.com/wiki/Release_Notes" target="_blank">osTicket wiki</a></p>
             <p><b>Stay up to date</b>: It's important to keep your osTicket installation up to date. Get announcements, security updates and alerts delivered directly to you! 
             <a target="_blank" href="http://osticket.com/support/subscribe.php">Get in the loop</a> today and stay informed!</p>
             <p><b>Commercial support available</b>: Get guidance and hands-on expertise to address unique challenges and make sure your osTicket runs smoothly, efficiently, and securely. <a target="_blank" href="http://osticket.com/support/commercial_support.php.php">Learn More!</a></p>
diff --git a/include/upgrader/prereq.inc.php b/include/upgrader/prereq.inc.php
index c08c7fed..40407d92 100644
--- a/include/upgrader/prereq.inc.php
+++ b/include/upgrader/prereq.inc.php
@@ -7,7 +7,7 @@
     <div id="main">
             <div id="intro">
              <p>Thank you for being a loyal osTicket user!</p>
-             <p>The upgrade wizard will guide you every step of the way in the upgrade process. While we try to ensure that the upgrade process is straightforward and painless, we can't guarantee it will be the case for every user.</p>
+             <p>The upgrade wizard will guide you every step of the way through the upgrade process. While we try to ensure that the upgrade process is straightforward and painless, we can't guarantee this will be the case for every user.</p>
             </div>
             <h2>Getting ready!</h2>
             <p>Before we begin, we'll check your server configuration to make sure you meet the minimum requirements to run the latest version of osTicket.</p>
@@ -20,10 +20,10 @@
                 MySQL v4.4 or greater - (<small><b><?php echo extension_loaded('mysql')?'module loaded':'missing!'; ?></b></small>)</li>
             </ul>
             <h3>Higly Recommended:</h3>
-            We hightly recommend that you follow the steps below.
+            We highly recommend that you follow the steps below.
             <ul>
-                <li>Backup the current database, if you haven't done so already.</li>
-                <li>Be patient the upgrade process will take a couple of seconds.</li>
+                <li>Back up the current database if you haven't done so already.</li>
+                <li>Be patient. The upgrade process will take a couple of seconds.</li>
             </ul>
             <div id="bar">
                 <form method="post" action="upgrade.php" id="prereq">
@@ -35,10 +35,10 @@
     </div>
     <div id="sidebar">
             <h3>Upgrade Tips</h3>
-            <p>1. Remember to backup your osTicket database</p>
-            <p>2. Refer to <a href="http://osticket.com/wiki/Upgrade_and_Migration" target="_blank">Upgrade Guide</a> for the latest tips</a>
+            <p>1. Remember to back up your osTicket database</p>
+            <p>2. Refer to the <a href="http://osticket.com/wiki/Upgrade_and_Migration" target="_blank">Upgrade Guide</a> for the latest tips</a>
             <p>3. If you experience any problems, you can always restore your files/dabase backup.</p>
-            <p>4. We can help, feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p>
+            <p>4. We can help! Feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p>
 
     </div>
     <div class="clear"></div>
diff --git a/include/upgrader/rename.inc.php b/include/upgrader/rename.inc.php
index 0b649bfa..b8fca94b 100644
--- a/include/upgrader/rename.inc.php
+++ b/include/upgrader/rename.inc.php
@@ -27,7 +27,7 @@
     <div id="sidebar">
             <h3>Need Help?</h3>
             <p>
-            If you are looking for a greater level of support, we provide <u>professional upgrade</u> and commercial support with guaranteed response times, and access to the core development team. We can also help customize osTicket or even add new features to the system to meet your unique needs. <a target="_blank" href="http://osticket.com/support/professional_services.php">Learn More!</a>
+            If you are looking for a greater level of support, we provide <u>professional upgrade</u> and commercial support with guaranteed response times and access to the core development team. We can also help customize osTicket or even add new features to the system to meet your unique needs. <a target="_blank" href="http://osticket.com/support/professional_services.php">Learn More!</a>
             </p>
     </div>
     <div class="clear"></div>
diff --git a/include/upgrader/upgrade.inc.php b/include/upgrader/upgrade.inc.php
index b157b6a0..d2f35589 100644
--- a/include/upgrader/upgrade.inc.php
+++ b/include/upgrader/upgrade.inc.php
@@ -18,14 +18,14 @@
     <div id="main">
             <div id="intro">
              <p>Thank you for taking the time to upgrade your osTicket intallation!</p>
-             <p>Please don't cancel or close the browser, any errors at this stage will be fatal.</p>
+             <p>Please don't cancel or close the browser; any errors at this stage will be fatal.</p>
             </div>
             <h2 id="task"><?php echo $action ?></h2>
             <p>The upgrade wizard will now attempt to upgrade your database and core settings!</p>
             <ul>
                 <li>Database enhancements</li>
                 <li>New and updated features</li>
-                <li>Enhance settings and security</li>
+                <li>Enhanced settings and security</li>
             </ul>
             <div id="bar">
                 <form method="post" action="upgrade.php" id="upgrade">
@@ -39,9 +39,9 @@
     </div>
     <div id="sidebar">
             <h3>Upgrade Tips</h3>
-            <p>1. Be patient the process will take a couple of minutes.</p>
+            <p>1. Be patient. The process will take a couple of minutes.</p>
             <p>2. If you experience any problems, you can always restore your files/database backup.</p>
-            <p>3. We can help, feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p>
+            <p>3. We can help! Feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p>
     </div>
     <div class="clear"></div>
     <div id="upgrading">

From a028453b5cb18d7456e81b7b90f65b6187ce05ff Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@Splinter.local>
Date: Wed, 10 Apr 2013 16:08:05 -0400
Subject: [PATCH 4/6] Fixed spelling regression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Higly —> Highly
---
 include/upgrader/prereq.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/upgrader/prereq.inc.php b/include/upgrader/prereq.inc.php
index 40407d92..56a9d347 100644
--- a/include/upgrader/prereq.inc.php
+++ b/include/upgrader/prereq.inc.php
@@ -19,7 +19,7 @@
                 <li class="<?php echo $upgrader->check_mysql()?'yes':'no'; ?>">
                 MySQL v4.4 or greater - (<small><b><?php echo extension_loaded('mysql')?'module loaded':'missing!'; ?></b></small>)</li>
             </ul>
-            <h3>Higly Recommended:</h3>
+            <h3>Highly Recommended:</h3>
             We highly recommend that you follow the steps below.
             <ul>
                 <li>Back up the current database if you haven't done so already.</li>

From fd384cae9aec8ce3b4b3db41b3cc8a512b93286b Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@Splinter.local>
Date: Wed, 10 Apr 2013 17:11:38 -0400
Subject: [PATCH 5/6] Spelling and readability fixes for /include/class.* files

Fixed some spelling mistakes.
---
 include/ajax.content.php    | 2 +-
 include/api.tickets.php     | 2 +-
 include/class.dept.php      | 4 ++--
 include/class.email.php     | 8 ++++----
 include/class.filter.php    | 2 +-
 include/class.mailfetch.php | 2 +-
 include/class.staff.php     | 4 ++--
 include/class.template.php  | 4 ++--
 include/class.ticket.php    | 6 +++---
 include/class.validator.php | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/ajax.content.php b/include/ajax.content.php
index c9c6b7d7..7ba1a1d4 100644
--- a/include/ajax.content.php
+++ b/include/ajax.content.php
@@ -39,7 +39,7 @@ function ticket_variables() {
         $content='
 <div style="width:680px;">
     <h2>Ticket Variables</h2>
-    Please note that non-base variables depends on the context of use. Visit osTicket Wiki for up to date documentation.
+    Please note that non-base variables depend on the context of use. Visit osTicket Wiki for up-to-date documentation.
     <br/>
     <table width="100%" border="0" cellspacing=1 cellpadding=2>
         <tr><td width="55%" valign="top"><b>Base Variables</b></td><td><b>Other Variables</b></td></tr>
diff --git a/include/api.tickets.php b/include/api.tickets.php
index 1cc93d99..f7b8ce35 100644
--- a/include/api.tickets.php
+++ b/include/api.tickets.php
@@ -159,7 +159,7 @@ function  process() {
         if(($ticket=$pipe->processEmail()))
            return $pipe->response(201, $ticket->getNumber());
 
-        return $pipe->exerr(416, 'Request failed -retry again!');
+        return $pipe->exerr(416, 'Request failed - retry again!');
     }
 }
 
diff --git a/include/class.dept.php b/include/class.dept.php
index cd89c2cb..78e59306 100644
--- a/include/class.dept.php
+++ b/include/class.dept.php
@@ -362,11 +362,11 @@ function save($id, $vars, &$errors) {
         } elseif(strlen($vars['name'])<4) {
             $errors['name']='Name is too short.';
         } elseif(($did=Dept::getIdByName($vars['name'])) && $did!=$id) {
-            $errors['name']='Department already exist';
+            $errors['name']='Department already exists';
         }
         
         if(!$vars['ispublic'] && ($vars['id']==$cfg->getDefaultDeptId()))
-            $errors['ispublic']='System default department can not be private';
+            $errors['ispublic']='System default department cannot be private';
 
         if($errors) return false;
 
diff --git a/include/class.email.php b/include/class.email.php
index d4009918..74f1c43c 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -224,11 +224,11 @@ function save($id,$vars,&$errors) {
         if(!$vars['email'] || !Validator::is_email($vars['email'])) {
             $errors['email']='Valid email required';
         }elseif(($eid=Email::getIdByEmail($vars['email'])) && $eid!=$id) {
-            $errors['email']='Email already exits';
+            $errors['email']='Email already exists';
         }elseif($cfg && !strcasecmp($cfg->getAdminEmail(), $vars['email'])) {
             $errors['email']='Email already used as admin email!';
         }elseif(Staff::getIdByEmail($vars['email'])) { //make sure the email doesn't belong to any of the staff 
-            $errors['email']='Email in-use by a staff member';
+            $errors['email']='Email in use by a staff member';
         }
 
         if(!$vars['name'])
@@ -284,7 +284,7 @@ function save($id,$vars,&$errors) {
                 $sql.=' AND email_id!='.db_input($id);
                 
             if(db_num_rows(db_query($sql)))
-                $errors['userid']=$errors['host']='Host/userid combination already in-use.';
+                $errors['userid']=$errors['host']='Host/userid combination already in use.';
         }
         
         $passwd=$vars['passwd']?$vars['passwd']:$vars['cpasswd'];
@@ -322,7 +322,7 @@ function save($id,$vars,&$errors) {
                            ));
             $mail = $smtp->connect();
             if(PEAR::isError($mail)) {
-                $errors['err']='Unable to login. Check SMTP settings.';
+                $errors['err']='Unable to log in. Check SMTP settings.';
                 $errors['smtp']='<br>'.$mail->getMessage();
             }else{
                 $smtp->disconnect(); //Thank you, sir!
diff --git a/include/class.filter.php b/include/class.filter.php
index 02a5e042..dfc05620 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -424,7 +424,7 @@ function save($id,$vars,&$errors) {
         if(!$vars['name'])
             $errors['name'] = 'Name required';
         elseif(($sid=self::getIdByName($vars['name'])) && $sid!=$id)
-            $errors['name'] = 'Name already in-use';
+            $errors['name'] = 'Name already in use';
 
         if(!$errors && !self::validate_rules($vars,$errors) && !$errors['rules'])
             $errors['rules'] = 'Unable to validate rules as entered';
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index d1032ba5..2e0b8b00 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -545,7 +545,7 @@ function run() {
                         "\nHost: ".$fetcher->getHost().
                         "\nError: ".$fetcher->getLastError().
                         "\n\n ".$errors.' consecutive errors. Maximum of '.$MAXERRORS. ' allowed'.
-                        "\n\n This could be connection issues related to the mail server. Next delayed login attempt in aprox. $TIMEOUT minutes";
+                        "\n\n This could be connection issues related to the mail server. Next delayed login attempt in approx. $TIMEOUT minutes";
                     $ost->alertAdmin('Mail Fetch Failure Alert', $msg, true);
                 }
             }
diff --git a/include/class.staff.php b/include/class.staff.php
index 414c835c..4c8a942f 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -661,14 +661,14 @@ function save($id, $vars, &$errors) {
         if(!$vars['username'] || strlen($vars['username'])<2)
             $errors['username']='Username required';
         elseif(($uid=Staff::getIdByUsername($vars['username'])) && $uid!=$id)
-            $errors['username']='Username already in-use';
+            $errors['username']='Username already in use';
         
         if(!$vars['email'] || !Validator::is_email($vars['email']))
             $errors['email']='Valid email required';
         elseif(Email::getIdByEmail($vars['email']))
             $errors['email']='Already in-use system email';
         elseif(($uid=Staff::getIdByEmail($vars['email'])) && $uid!=$id)
-            $errors['email']='Email already in-use by another staff member';
+            $errors['email']='Email already in use by another staff member';
 
         if($vars['phone'] && !Validator::is_phone($vars['phone']))
             $errors['phone']='Valid number required';
diff --git a/include/class.template.php b/include/class.template.php
index 629f76f2..ac87fe68 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -256,7 +256,7 @@ function updateMsgTemplate($vars, &$errors) {
     function update($vars,&$errors) {
 
         if(!$vars['isactive'] && $this->isInUse())
-            $errors['isactive']='Template in-use can not be disabled!';
+            $errors['isactive']='Template in use cannot be disabled!';
 
         if(!$this->save($this->getId(),$vars,$errors))
             return false;
@@ -302,7 +302,7 @@ function message_templates(){
                         'ticket_notice'=>array('name'=>'New Ticket Notice',
                                                'desc'=>'Notice sent to user, if enabled, on new ticket created by staff on their behalf (e.g phone calls).'),
                         'overlimit_notice'=>array('name'=>'Over Limit Notice',
-                                                  'desc'=>'A one time notice sent, if enabled, when user has reached the maximum allowed open tickets.'),
+                                                  'desc'=>'A one-time notice sent, if enabled, when user has reached the maximum allowed open tickets.'),
                         'ticket_reply'=>array('name'=>'Response/Reply Template',
                                               'desc'=>'Template used on ticket response/reply'),
                         'ticket_alert'=>array('name'=>'New Ticket Alert',
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 21a4bd8f..c88361e5 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1606,11 +1606,11 @@ function update($vars, &$errors) {
 
         if($vars['duedate']) {
             if($this->isClosed())
-                $errors['duedate']='Duedate can NOT be set on a closed ticket';
+                $errors['duedate']='Due date can NOT be set on a closed ticket';
             elseif(!$vars['time'] || strpos($vars['time'],':')===false)
                 $errors['time']='Select time';
             elseif(strtotime($vars['duedate'].' '.$vars['time'])===false)
-                $errors['duedate']='Invalid duedate';
+                $errors['duedate']='Invalid due date';
             elseif(strtotime($vars['duedate'].' '.$vars['time'])<=time())
                 $errors['duedate']='Due date must be in the future';
         }
@@ -1892,7 +1892,7 @@ function create($vars, &$errors, $origin, $autorespond=true, $alertstaff=true) {
             if(!$vars['time'] || strpos($vars['time'],':')===false)
                 $errors['time']='Select time';
             elseif(strtotime($vars['duedate'].' '.$vars['time'])===false)
-                $errors['duedate']='Invalid duedate';
+                $errors['duedate']='Invalid due date';
             elseif(strtotime($vars['duedate'].' '.$vars['time'])<=time())
                 $errors['duedate']='Due date must be in the future';
         }
diff --git a/include/class.validator.php b/include/class.validator.php
index 611d8032..57ec2ebe 100644
--- a/include/class.validator.php
+++ b/include/class.validator.php
@@ -40,7 +40,7 @@ function validate($source,$userinput=true){
         if(!$source || !is_array($source))
             $this->errors['err']='Invalid input';
         elseif(!$this->fields || !is_array($this->fields))
-            $this->errors['err']='No fields setup';
+            $this->errors['err']='No fields set up';
         //Abort on error
         if($this->errors)
             return false;

From 2056fd0a30b557aba366ba8cfcd93b568fdece4a Mon Sep 17 00:00:00 2001
From: Andrew Abdalian <abdalian@Splinter.local>
Date: Wed, 10 Apr 2013 17:25:31 -0400
Subject: [PATCH 6/6] A couple more spelling/readability fixes.

More fies.
---
 include/client/thankyou.inc.php | 2 +-
 include/fpdf/fpdf.php           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/client/thankyou.inc.php b/include/client/thankyou.inc.php
index 6e2fe3b4..1e365f23 100644
--- a/include/client/thankyou.inc.php
+++ b/include/client/thankyou.inc.php
@@ -13,7 +13,7 @@
         You'll need the ticket number along with your email to view status and progress online. 
     </p>
     <p>
-     If you wish to send additional comments or information regarding same issue, please follow the instructions on the email.
+     If you wish to send additional comments or information regarding same issue, please follow the instructions in the email.
     </p>
     <?php } ?>
     <p>Support Team </p>
diff --git a/include/fpdf/fpdf.php b/include/fpdf/fpdf.php
index f96a20ec..b2fc21dd 100644
--- a/include/fpdf/fpdf.php
+++ b/include/fpdf/fpdf.php
@@ -1010,13 +1010,13 @@ function Output($name='', $dest='')
 		case 'I':
 			//Send to standard output
 			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+				$this->Error('Some data has already been output. Can\'t send PDF file');
 			if(php_sapi_name()!='cli')
 			{
 				//We send to a browser
 				header('Content-Type: application/pdf');
 				if(headers_sent())
-					$this->Error('Some data has already been output, can\'t send PDF file');
+					$this->Error('Some data has already been output. Can\'t send PDF file');
 				header('Content-Length: '.strlen($this->buffer));
 				header('Content-Disposition: inline; filename="'.$name.'"');
 				header('Cache-Control: private, max-age=0, must-revalidate');
@@ -1028,10 +1028,10 @@ function Output($name='', $dest='')
 		case 'D':
 			//Download file
 			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+				$this->Error('Some data has already been output. Can\'t send PDF file');
 			header('Content-Type: application/x-download');
 			if(headers_sent())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+				$this->Error('Some data has already been output. Can\'t send PDF file');
 			header('Content-Length: '.strlen($this->buffer));
 			header('Content-Disposition: attachment; filename="'.$name.'"');
 			header('Cache-Control: private, max-age=0, must-revalidate');