Merge pull request #53 from greezybacon/feature/ticket-user-vars

Add %{ticket.user} to ticket template variables

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.ticket.php

@@ -1094,6 +1094,9 @@ class Ticket {
 
                 return $closedate;
                 break;
+            case 'user':
+                return $this->getOwner();
+                break;
             default:
                 if (isset($this->_answers[$tag]))
                     // The answer object is retrieved here which will

include/class.user.php

@@ -107,15 +107,31 @@ class User extends UserModel {
         return new PersonsName($this->name);
     }
 
+    function asVar() {
+        return (string) $this->getName();
+    }
+
+    function getVar($tag) {
+        if($tag && is_callable(array($this, 'get'.ucfirst($tag))))
+            return call_user_func(array($this, 'get'.ucfirst($tag)));
+
+        $tag = strtolower($tag);
+        foreach ($this->getDynamicData() as $e)
+            if ($e->getAnswer($tag))
+                return $e;
+    }
+
     function getDynamicData() {
-        $data = DynamicFormEntry::forClient($this->id);
-        if (!$data[0]) {
-            $data = array();
-            $g = UserForm::getInstance();
-            $g->setClientId($this->id);
-            $data[] = $g;
+        if (!isset($this->_entries)) {
+            $this->_entries = DynamicFormEntry::forClient($this->id);
+            if (!$this->_entries[0]) {
+                $this->_entries = array();
+                $g = UserForm::getInstance();
+                $g->setClientId($this->id);
+                $this->_entries[] = $g;
+            }
         }
-        return $data;
+        return $this->_entries;
     }
 
     function save($refetch=false) {