Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

.gitignore

@@ -45,6 +45,7 @@
 /public/assets/*.*
 /public/assets/app
 /public/assets/custom
+/public/assets/chat/node_modules
 /tmp/*
 /tmp/pids/*
 

app/assets/javascripts/app/controllers/cti.coffee

@@ -1,6 +1,7 @@
 class App.CTI extends App.Controller
   events:
-    'click .js-check': 'done'
+    'click .js-check': 'done',
+    'click .js-new-user': 'new_user'
 
   constructor: ->
     super
@@ -167,6 +168,26 @@ class App.CTI extends App.Controller
       data:  JSON.stringify(done: done)
     )
 
+  new_user: (e) ->
+    e.preventDefault()
+    phone = $(e.currentTarget).text()
+    new App.ControllerGenericNew(
+      pageData:
+        title:     'Users'
+        home:      'users'
+        object:    'User'
+        objects:   'Users'
+        navupdate: '#users'
+      genericObject: 'User'
+      item:
+        phone: phone
+      container: @el.closest('.content')
+      callback: @new_ticket
+    )
+
+  new_ticket: (customer) ->
+    @navigate "#ticket/create/customer/#{customer.id}"
+
   show: (params) =>
     @title 'CTI', true
     @navupdate '#cti'

app/assets/javascripts/app/index.coffee

@@ -212,7 +212,14 @@ class App extends Spine.Controller
           if result
             result = result + ', '
           if item.name
-            result = result + App.Utils.htmlEscape(item.name) + ' '
+            item.name = item.name
+              .replace(',', '')
+              .replace(';', '')
+              .replace('"', '')
+              .replace('\'', '')
+            if item.name.match(/\@|,|;|\^|\+|#|§|\$|%|&|\/|\(|\)|=|\?|\*/)
+              item.name = "\"#{item.name}\""
+            result = "#{result}#{App.Utils.htmlEscape(item.name)} "
           if item.address
             result = result + " <span class=\"text-muted\">&lt;#{App.Utils.htmlEscape(item.address)}&gt</span>"
         result

app/assets/javascripts/app/views/cti/index.jst.eco

@@ -46,7 +46,7 @@
             <% if shown: %>
               <small><%= item.from %></small>
             <% else: %>
-              <%= item.from %>
+              <a class="js-new-user" href="#"><%= item.from %></a>
             <% end %>
           </td>
           <td>