Skip to content
Snippets Groups Projects
Commit ed2a6efd authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge pull request #469 from greezybacon/issue/logged-in-client


forms: Fix ticket submission if already logged in

Reviewed-By: default avatarPeter Rotich <peter@osticket.com>
parents cc584e58 91908271
No related branches found
No related tags found
No related merge requests found
......@@ -27,6 +27,7 @@ class Client {
var $_answers;
var $ticket_id;
var $user_id;
var $ticketID;
var $ht;
......@@ -42,7 +43,7 @@ class Client {
if(!$id && !($id=$this->getId()))
return false;
$sql='SELECT ticket.ticket_id, ticketID, email.address as email '
$sql='SELECT ticket.ticket_id, ticketID, email.address as email, user.id as user_id '
.' FROM '.TICKET_TABLE.' ticket '
.' LEFT JOIN '.USER_TABLE.' user ON user.id = ticket.user_id'
.' LEFT JOIN '.USER_EMAIL_TABLE.' email ON user.id = email.user_id'
......@@ -59,7 +60,8 @@ class Client {
$this->ticket_id = $this->ht['ticket_id'];
$this->ticketID = $this->ht['ticketID'];
$user = User::lookup(array('emails__address'=>$this->ht['email']));
$user = User::lookup($this->ht['user_id']);
$this->user_id = $this->ht['user_id'];
$this->fullname = $user->getFullName();
$this->username = $this->ht['email'];
......@@ -90,6 +92,10 @@ class Client {
return $this->id;
}
function getUserId() {
return $this->user_id;
}
function getEmail() {
return $this->email;
}
......
......@@ -21,8 +21,7 @@ if($_POST):
$vars = $_POST;
$vars['deptId']=$vars['emailId']=0; //Just Making sure we don't accept crap...only topicId is expected.
if($thisclient) {
$vars['name']=$thisclient->getName();
$vars['email']=$thisclient->getEmail();
$vars['uid'] = $thisclient->getUserId();
} elseif($cfg->isCaptchaEnabled()) {
if(!$_POST['captcha'])
$errors['captcha']='Enter text shown on the image';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment