Lint and misc. fixes

include/class.nav.php

@@ -287,7 +287,7 @@ class UserNav {
                                             'title'=>'Show all tickets');
                 } else {
                     $navs['tickets']=array('desc'=>'View Ticket Thread',
-                                           'href'=>sprintf('tickets.php?id=%d',$user->getTicketID()),
+                                           'href'=>sprintf('tickets.php?id=%d',$user->getTicketId()),
                                            'title'=>'View ticket status');
                 }
             } else {

include/client/open.inc.php

@@ -4,7 +4,7 @@ $info=array();
 if($thisclient && $thisclient->isValid()) {
     $info=array('name'=>$thisclient->getName(),
                 'email'=>$thisclient->getEmail(),
-                'phone'=>$thisclient->getPhone());
+                'phone'=>$thisclient->getPhoneNumber());
 }
 
 $info=($_POST && $errors)?Format::htmlchars($_POST):$info;

include/client/tickets.inc.php

@@ -101,7 +101,7 @@ if($search)
 $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting
 
 ?>
-<h1>My Tickets</h1>
+<h1>Tickets</h1>
 <br>
 <form action="tickets.php" method="get" id="ticketSearchForm">
     <input type="hidden" name="a"  value="search">

include/client/view.inc.php

@@ -13,8 +13,8 @@ if(!$dept || !$dept->isPublic())
     <tr>
         <td colspan="2" width="100%">
             <h1>
-                Ticket #<?php echo $ticket->getExtId(); ?> &nbsp;
-                <a href="view.php?id=<?php echo $ticket->getExtId(); ?>" title="Reload"><span class="Icon refresh">&nbsp;</span></a>
+                Ticket #<?php echo $ticket->getNumber(); ?> &nbsp;
+                <a href="view.php?id=<?php echo $ticket->getId(); ?>" title="Reload"><span class="Icon refresh">&nbsp;</span></a>
             </h1>
         </td>
     </tr>

login.php

@@ -25,7 +25,7 @@ if ($_POST) {
     if (($user = UserAuthenticationBackend::process($_POST['lemail'],
                     $_POST['lticket'], $errors))) {
         //XXX: Ticket owner is assumed.
-        @header('Location: tickets.php?id='.$user->getTicketID());
+        @header('Location: tickets.php?id='.$user->getTicketId());
         require_once('tickets.php'); //Just in case of 'header already sent' error.
         exit;
     } elseif(!$errors['err']) {

tickets.php

@@ -23,7 +23,7 @@ if($_REQUEST['id']) {
     if (!($ticket = Ticket::lookup($_REQUEST['id']))) {
         $errors['err']='Unknown or invalid ticket ID.';
     } elseif(!$ticket->checkUserAccess($thisclient)) {
-        $errors['err']='Unknown or invalid ticket ID.'; //Using generic message on purpose!
+        $errors['err']='Unknown or invalid ticket.'; //Using generic message on purpose!
         $ticket=null;
     }
 }

view.php

@@ -23,8 +23,8 @@ if (!$thisclient || !$thisclient->isValid()) {
     // Authenticated user can be of type ticket owner or collaborator
     $errors = array();
     $user =  UserAuthenticationBackend::singleSignOn($errors);
-    if ($user && $user->getTicketID())
-        @header('Location: tickets.php?id='.$user->getTicketID());
+    if ($user && $user->getTicketId())
+        @header('Location: tickets.php?id='.$user->getTicketId());
 }
 //Simply redirecting to tickets.php until multiview is implemented.
 require('tickets.php');