Added <label> tags; tweaked spelling, grammar and readability

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>

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!');
     }
 }
 

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;
 

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!

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';

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);
                 }
             }

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';

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',

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';
         }

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;

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>

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');