diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99741dc47..20297b184 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,17 @@ test:integration:email_deliver: - ruby -I test/ test/integration/email_deliver_test.rb - rake db:drop +test:integration:email_keep_on_server: + stage: test + tags: + - core + script: + - export RAILS_ENV=test + - rake db:create + - rake db:migrate + - ruby -I test/ test/integration/email_keep_on_server_test.rb + - rake db:drop + test:integration:twitter: stage: test tags: diff --git a/.travis.yml b/.travis.yml index 510217e74..c8153f76e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ notifications: env: - DB=mysql - DB=postgresql - - BUNDLE_JOBS=8 addons: postgresql: "9.4" apt: diff --git a/Gemfile b/Gemfile index 2695e13bb..9f5658fcf 100644 --- a/Gemfile +++ b/Gemfile @@ -40,6 +40,7 @@ gem 'omniauth-gitlab' gem 'omniauth-google-oauth2' gem 'omniauth-linkedin-oauth2' gem 'omniauth-twitter' +gem 'omniauth-microsoft-office365' gem 'twitter' gem 'telegramAPI' diff --git a/Gemfile.lock b/Gemfile.lock index 5b161264b..c8671468b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,10 +151,11 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-symlink (0.1.0) + guard-symlink (0.1.1) + guard guard-compat (~> 1.1) hashdiff (0.3.2) - hashie (3.4.4) + hashie (3.5.5) htmlentities (4.3.4) http (1.0.4) addressable (~> 2.3) @@ -169,7 +170,7 @@ GEM icalendar (2.4.1) inflection (1.0.0) json (1.8.6) - jwt (1.5.4) + jwt (1.5.6) kgio (2.11.0) koala (2.4.0) addressable @@ -194,7 +195,7 @@ GEM mini_portile2 (2.2.0) minitest (5.10.2) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.4.6) naught (1.1.0) @@ -208,33 +209,36 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.1) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.4.1) sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.6.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) + omniauth-google-oauth2 (0.5.0) + jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) omniauth-linkedin-oauth2 (0.1.5) omniauth (~> 1.0) omniauth-oauth2 + omniauth-microsoft-office365 (0.0.7) + omniauth + omniauth-oauth2 omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -463,6 +467,7 @@ DEPENDENCIES omniauth-gitlab omniauth-google-oauth2 omniauth-linkedin-oauth2 + omniauth-microsoft-office365 omniauth-oauth2 omniauth-twitter pg @@ -499,4 +504,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.13.7 + 1.15.1 diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index 99a71620e..a6855923a 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -560,21 +560,24 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # inbound configureAttributesInbound = [ - { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, - { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, - { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, - { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, - { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false }, + { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, + { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off' }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, + { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, item_class: 'formGroup--halfSize' }, + { name: 'options::keep_on_server', display: 'Keep messages on server', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, translate: true, default: false, item_class: 'formGroup--halfSize' }, ] showHideFolder = (params, attribute, attributes, classname, form, ui) -> return if !params if params.adapter is 'imap' ui.show('options::folder') + ui.show('options::keep_on_server') return ui.hide('options::folder') + ui.hide('options::keep_on_server') handlePort = (params, attribute, attributes, classname, form, ui) -> return if !params @@ -606,9 +609,10 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # fill user / password based on intro info channel_used = { options: {} } if @account['meta'] - channel_used['options']['user'] = @account['meta']['email'] - channel_used['options']['password'] = @account['meta']['password'] - channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['user'] = @account['meta']['email'] + channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['keep_on_server'] = @account['meta']['keep_on_server'] # show used backend @$('.base-outbound-settings').html('') @@ -670,7 +674,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal for key, value of data.setting @account[key] = value - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-intro') @@ -724,7 +728,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # remember account settings @account.inbound = params - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-inbound') diff --git a/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee b/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee index 671da7abc..5f731803b 100644 --- a/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee +++ b/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee @@ -9,43 +9,7 @@ class Index extends App.ControllerSubContent @render() render: => - auth_provider_all = { - facebook: { - url: '/auth/facebook' - name: 'Facebook' - config: 'auth_facebook' - }, - twitter: { - url: '/auth/twitter' - name: 'Twitter' - config: 'auth_twitter' - }, - linkedin: { - url: '/auth/linkedin' - name: 'LinkedIn' - config: 'auth_linkedin' - }, - github: { - url: '/auth/github' - name: 'GitHub' - config: 'auth_github' - }, - gitlab: { - url: '/auth/gitlab' - name: 'GitLab' - config: 'auth_gitlab' - }, - google_oauth2: { - url: '/auth/google_oauth2' - name: 'Google' - config: 'auth_google_oauth2' - }, - oauth2: { - url: '/auth/oauth2' - name: 'OAuth2' - config: 'auth_oauth2' - }, - } + auth_provider_all = App.Config.get('auth_provider_all') auth_providers = {} for key, provider of auth_provider_all if @Config.get(provider.config) is true || @Config.get(provider.config) is 'true' @@ -90,3 +54,45 @@ class Index extends App.ControllerSubContent ) App.Config.set('LinkedAccounts', { prio: 4000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index, permission: ['user_preferences.linked_accounts'] }, 'NavBarProfile') +App.Config.set('auth_provider_all', { + facebook: + url: '/auth/facebook' + name: 'Facebook' + config: 'auth_facebook' + class: 'facebook' + twitter: + url: '/auth/twitter' + name: 'Twitter' + config: 'auth_twitter' + class: 'twitter' + linkedin: + url: '/auth/linkedin' + name: 'LinkedIn' + config: 'auth_linkedin' + class: 'linkedin' + github: + url: '/auth/github' + name: 'GitHub' + config: 'auth_github' + class: 'github' + gitlab: + url: '/auth/gitlab' + name: 'GitLab' + config: 'auth_gitlab' + class: 'gitlab' + microsoft_office365: + url: '/auth/microsoft_office365' + name: 'Office 365' + config: 'auth_microsoft_office365' + class: 'office365' + google_oauth2: + url: '/auth/google_oauth2' + name: 'Google' + config: 'auth_google_oauth2' + class: 'google' + oauth2: + url: '/auth/oauth2' + name: 'OAuth2' + config: 'auth_oauth2' + class: 'oauth2' +}) diff --git a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee index 0ac160b3c..80d61840b 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee @@ -82,7 +82,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi view: shown: true invite_customer: - show: false + shown: false required: false 'admin.user': create: @@ -94,10 +94,10 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi view: shown: true invite_agent: - show: false + shown: false required: false invite_customer: - show: false + shown: false required: false Organization: 'ticket.customer': diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index f8e969e86..96f4de60d 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -587,7 +587,7 @@ class ChatWindow extends App.Controller @sounds.message.play() @notifyDesktop( title: @name - body: message + body: App.Utils.html2text(message) url: '#customer_chat' callback: => App.Event.trigger('chat_focus', { session_id: @session.session_id }) diff --git a/app/assets/javascripts/app/controllers/getting_started.coffee b/app/assets/javascripts/app/controllers/getting_started.coffee index c7d236267..8c2fbb71d 100644 --- a/app/assets/javascripts/app/controllers/getting_started.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.coffee @@ -450,8 +450,8 @@ class EmailNotification extends App.WizardFullScreen if adapter is 'smtp' configureAttributesOutbound = [ { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password' }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off' }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', single: true }, { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false }, ] @form = new App.ControllerForm( @@ -671,20 +671,24 @@ class ChannelEmail extends App.WizardFullScreen # inbound configureAttributesInbound = [ - { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, - { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, - { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, - { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, + { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', single: true }, + { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, + { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, item_class: 'formGroup--halfSize' }, + { name: 'options::keep_on_server', display: 'Keep messages on server', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, translate: true, default: false, item_class: 'formGroup--halfSize' }, ] showHideFolder = (params, attribute, attributes, classname, form, ui) -> return if !params if params.adapter is 'imap' ui.show('options::folder') + ui.show('options::keep_on_server') return ui.hide('options::folder') + ui.hide('options::keep_on_server') handlePort = (params, attribute, attributes, classname, form, ui) -> return if !params @@ -700,7 +704,7 @@ class ChannelEmail extends App.WizardFullScreen return new App.ControllerForm( - el: @$('.base-inbound-settings'), + el: @$('.base-inbound-settings') model: configure_attributes: configureAttributesInbound className: '' @@ -716,8 +720,10 @@ class ChannelEmail extends App.WizardFullScreen # fill user / password based on intro info channel_used = { options: {} } if @account['meta'] - channel_used['options']['user'] = @account['meta']['email'] - channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['user'] = @account['meta']['email'] + channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['keep_on_server'] = @account['meta']['keep_on_server'] # show used backend @$('.base-outbound-settings').html('') @@ -725,8 +731,8 @@ class ChannelEmail extends App.WizardFullScreen if adapter is 'smtp' configureAttributesOutbound = [ { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', single: true }, { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false }, ] @form = new App.ControllerForm( @@ -745,7 +751,7 @@ class ChannelEmail extends App.WizardFullScreen @account.meta = params @disable(e) - @$('.js-probe .js-email').text( params.email ) + @$('.js-probe .js-email').text(params.email) @showSlide('js-probe') @ajax( @@ -760,7 +766,7 @@ class ChannelEmail extends App.WizardFullScreen for key, value of data.setting @account[key] = value - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-intro') @@ -809,7 +815,7 @@ class ChannelEmail extends App.WizardFullScreen # remember account settings @account.inbound = params - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s emails in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-inbound') diff --git a/app/assets/javascripts/app/controllers/login.coffee b/app/assets/javascripts/app/controllers/login.coffee index 322a518c7..6e7f608d3 100644 --- a/app/assets/javascripts/app/controllers/login.coffee +++ b/app/assets/javascripts/app/controllers/login.coffee @@ -38,50 +38,7 @@ class Index extends App.ControllerContent ) render: (data = {}) -> - auth_provider_all = { - facebook: { - url: '/auth/facebook', - name: 'Facebook', - config: 'auth_facebook', - class: 'facebook' - }, - twitter: { - url: '/auth/twitter' - name: 'Twitter' - config: 'auth_twitter' - class: 'twitter' - }, - linkedin: { - url: '/auth/linkedin' - name: 'LinkedIn' - config: 'auth_linkedin' - class: 'linkedin' - }, - github: { - url: '/auth/github' - name: 'GitHub' - config: 'auth_github' - class: 'github' - }, - gitlab: { - url: '/auth/gitlab' - name: 'GitLab' - config: 'auth_gitlab' - class: 'gitlab' - }, - google_oauth2: { - url: '/auth/google_oauth2' - name: 'Google' - config: 'auth_google_oauth2' - class: 'google' - }, - oauth2: { - url: '/auth/oauth2' - name: 'OAuth2' - config: 'auth_oauth2' - class: 'oauth2' - }, - } + auth_provider_all = App.Config.get('auth_provider_all') auth_providers = [] for key, provider of auth_provider_all if @Config.get(provider.config) is true || @Config.get(provider.config) is 'true' diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee index 6b60eb01e..df150405a 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee @@ -391,6 +391,7 @@ class App.TicketZoomArticleActions extends App.Controller body = @el.closest('.ticketZoom').find('.article-add [data-name="body"]').html() || '' # check if quote need to be added + signaturePosition = 'bottom' selected = App.ClipBoard.getSelected('html') if selected selected = App.Utils.htmlCleanup(selected).html() @@ -399,6 +400,16 @@ class App.TicketZoomArticleActions extends App.Controller if selected selected = App.Utils.textCleanup(selected) selected = App.Utils.text2html(selected) + + # full quote, if needed + if !selected && article && App.Config.get('ui_ticket_zoom_article_email_full_quote') + signaturePosition = 'top' + if article.content_type.match('html') + selected = App.Utils.textCleanup(article.body) + if article.content_type.match('plain') + selected = App.Utils.textCleanup(selected) + selected = App.Utils.text2html(selected) + if selected selected = "


#{selected}

" @@ -409,7 +420,12 @@ class App.TicketZoomArticleActions extends App.Controller type = App.TicketArticleType.findByAttribute(name:'email') - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew } ) + App.Event.trigger('ui::ticket::setArticleType', { + ticket: @ticket + type: type + article: articleNew + signaturePosition: signaturePosition + }) telegramPersonalMessageReply: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index 60fd1b1bf..82ed57e1e 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -59,7 +59,7 @@ class App.TicketZoomArticleNew extends App.Controller @$('[name="' + key + '"]').val(value).trigger('change') # preselect article type - @setArticleType(data.type.name) + @setArticleType(data.type.name, data.signaturePosition) # set focus at end of field if data.position is 'end' @@ -483,7 +483,7 @@ class App.TicketZoomArticleNew extends App.Controller @$('[name=internal]').val('') - setArticleType: (type) => + setArticleType: (type, signaturePosition = 'bottom') => wasScrolledToBottom = @isScrolledToBottom() @type = type @$('[name=type]').val(type).trigger('change') @@ -532,7 +532,10 @@ class App.TicketZoomArticleNew extends App.Controller body.append('

') signature = $("
#{signatureFinished}
") App.Utils.htmlStrip(signature) - body.append(signature) + if signaturePosition is 'top' + body.prepend(signature) + else + body.append(signature) @$('[data-name=body]').replaceWith(body) # remove old signature @@ -566,6 +569,20 @@ class App.TicketZoomArticleNew extends App.Controller @delay(@updateLetterCount, 600) @$('.js-textSizeLimit').removeClass('hide') + # convert remote src images to data uri + @$('[data-name=body] img').each( (i,image) -> + $image = $(image) + src = $image.attr('src') + if !_.isEmpty(src) && !src.match(/^data:image/i) + canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + ctx = canvas.getContext('2d') + ctx.drawImage(image, 0, 0) + dataURL = canvas.toDataURL() + $image.attr('src', dataURL) + ) + @scrollToBottom() if wasScrolledToBottom isScrolledToBottom: -> diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee index ad612da6b..6fc2ef5cb 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee @@ -1,5 +1,6 @@ class SidebarOrganization extends App.Controller sidebarItem: => + return if !@permissionCheck('ticket.agent') return if !@ticket.organization_id { head: 'Organization' diff --git a/app/assets/javascripts/app/controllers/widget/dev_banner.coffee b/app/assets/javascripts/app/controllers/widget/dev_banner.coffee index a8f7f5c9e..28d534391 100644 --- a/app/assets/javascripts/app/controllers/widget/dev_banner.coffee +++ b/app/assets/javascripts/app/controllers/widget/dev_banner.coffee @@ -5,10 +5,10 @@ class Widget banner = """ | | Welcome Zammad Developer! -| You can enable debugging by the following examples (value is a regex): +| You can enable debugging with the following examples (value is a regex): | | App.Log.config('module', '(websocket|delay|interval)') // enable debugging for websocket, delay and interval class -| App.Log.config('content', 'send') // enable debugging for messages which contains the string 'send' +| App.Log.config('content', 'send') // enable debugging for messages which contain the string 'send' | App.Log.config('banner', false) // disable this banner | | App.Log.config() // current settings diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee index 9c607eee0..13c6157a2 100644 --- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee +++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee @@ -38,11 +38,16 @@ class App.PrettyDate months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] month = months[created.getMonth()] - # for less than 7 days - if diff < (60 * 60 * 24 * 7) + # for less than 6 days + # weekday HH::MM + if diff < (60 * 60 * 24 * 6) string = "#{App.i18n.translateInline(weekday)} #{created.getHours()}:#{@s(created.getMinutes(), 2)}" - else if diff < (60 * 60 * 24 * 7) * 365 + # if it was this year + # weekday DD. MM HH::MM + else if created.getYear() is current.getYear() string = "#{App.i18n.translateInline(weekday)} #{created.getDate()}. #{App.i18n.translateInline(month)} #{created.getHours()}:#{@s(created.getMinutes(), 2)}" + # if it was the year before + # weekday YYYY-MM-DD HH::MM else string = "#{App.i18n.translateInline(weekday)} #{App.i18n.translateTimestamp(time)}" if escalation diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js index 2a1994828..d074e3dff 100644 --- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js +++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js @@ -295,7 +295,7 @@ else { img = "" } - document.execCommand('insertHTML', false, img) + _this.paste(img) } // resize if to big @@ -367,13 +367,7 @@ text = App.Utils.removeEmptyLines(text) _this.log('insert', text) - // as fallback, insert html via pasteHtmlAtCaret (for IE 11 and lower) - if (docType == 'text3') { - _this.pasteHtmlAtCaret(text) - } - else { - document.execCommand('insertHTML', false, text) - } + _this.paste(text) return true }) @@ -533,37 +527,6 @@ return this.$element.html().trim() } - // taken from https://stackoverflow.com/questions/6690752/insert-html-at-caret-in-a-contenteditable-div/6691294#6691294 - Plugin.prototype.pasteHtmlAtCaret = function(html) { - var sel, range; - if (window.getSelection) { - sel = window.getSelection() - if (sel.getRangeAt && sel.rangeCount) { - range = sel.getRangeAt(0) - range.deleteContents() - - var el = document.createElement('div') - el.innerHTML = html; - var frag = document.createDocumentFragment(), node, lastNode - while ( (node = el.firstChild) ) { - lastNode = frag.appendChild(node) - } - range.insertNode(frag) - - if (lastNode) { - range = range.cloneRange() - range.setStartAfter(lastNode) - range.collapse(true) - sel.removeAllRanges() - sel.addRange(range) - } - } - } - else if (document.selection && document.selection.type != 'Control') { - document.selection.createRange().pasteHTML(html) - } - } - // log method Plugin.prototype.log = function() { if (App && App.Log) { @@ -574,7 +537,30 @@ } } - $.fn[pluginName] = function ( options ) { + // paste some content + Plugin.prototype.paste = function(string) { + var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; + + // IE <= 10 + if (document.selection && document.selection.createRange) { + var range = document.selection.createRange() + if (range.pasteHTML) { + range.pasteHTML(string) + } + } + // IE == 11 + else if (isIE11 && document.getSelection) { + var range = document.getSelection().getRangeAt(0) + var nnode = document.createElement('div') + range.surroundContents(nnode) + nnode.innerHTML = string + } + else { + document.execCommand('insertHTML', false, string) + } + } + + $.fn[pluginName] = function (options) { return this.each(function () { if (!$.data(this, 'plugin_' + pluginName)) { $.data(this, 'plugin_' + pluginName, diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index 6236f42d3..699ff1847 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -250,9 +250,21 @@ // paste some content Plugin.prototype.paste = function(string) { - if (document.selection) { // IE + var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; + + // IE <= 10 + if (document.selection && document.selection.createRange) { var range = document.selection.createRange() - range.pasteHTML(string) + if (range.pasteHTML) { + range.pasteHTML(string) + } + } + // IE == 11 + else if (isIE11 && document.getSelection) { + var range = document.getSelection().getRangeAt(0) + var nnode = document.createElement('div') + range.surroundContents(nnode) + nnode.innerHTML = string } else { document.execCommand('insertHTML', false, string) @@ -295,14 +307,7 @@ // for chrome, insert space again if (start) { if (spacerChar === ' ') { - string = " " - if (document.selection) { // IE - var range = document.selection.createRange() - range.pasteHTML(string) - } - else { - document.execCommand('insertHTML', false, string) - } + this.paste(' ') } } } diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee index f7c708b78..49ad8aac9 100644 --- a/app/assets/javascripts/app/models/_application_model.coffee +++ b/app/assets/javascripts/app/models/_application_model.coffee @@ -32,6 +32,10 @@ class App.Model extends Spine.Model return @title if @subject return @subject + if @phone + return @phone + if @login + return @login return '???' displayNameLong: -> @@ -57,6 +61,12 @@ class App.Model extends Spine.Model return @email if @title return @title + if @subject + return @subject + if @phone + return @phone + if @login + return @login return '???' icon: (user) -> @@ -165,6 +175,31 @@ class App.Model extends Spine.Model ### +set new attributes of model (remove already available attributes) + + App.Model.attributesSet(attributes) + + ### + + @attributesSet: (attributes) -> + + configure_attributes = App[ @.className ].configure_attributes + attributesNew = [] + for localAttribute in configure_attributes + found = false + for attribute in attributes + if attribute.name is localAttribute.name + found = true + break + if !found + attributesNew.push localAttribute + for attribute in attributes + App[@.className].attributes.push attribute.name + attributesNew.push attribute + App[ @.className ].configure_attributes = attributesNew + + ### + attributes = App.Model.attributesGet(optionalScreen, optionalAttributesList) returns diff --git a/app/assets/javascripts/app/views/getting_started/email.jst.eco b/app/assets/javascripts/app/views/getting_started/email.jst.eco index e3ef082f8..1d2d0cb50 100644 --- a/app/assets/javascripts/app/views/getting_started/email.jst.eco +++ b/app/assets/javascripts/app/views/getting_started/email.jst.eco @@ -63,7 +63,7 @@
-
+

<%- @T('Email Inbound') %>

diff --git a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco index 7fc1e34c6..50ff41cc4 100644 --- a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco @@ -51,6 +51,10 @@
+
+ + +
diff --git a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco index 93f91446e..07f1630aa 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco @@ -116,8 +116,8 @@
- <%- @Icon('magnifier') %> + <%- @Icon('magnifier') %>
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index 00b086f48..135c1c859 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -24,7 +24,7 @@
- +
diff --git a/app/assets/javascripts/app/views/search/index.jst.eco b/app/assets/javascripts/app/views/search/index.jst.eco index 504e997f3..55637065d 100644 --- a/app/assets/javascripts/app/views/search/index.jst.eco +++ b/app/assets/javascripts/app/views/search/index.jst.eco @@ -3,8 +3,8 @@
- <%- @Icon('magnifier') %> " value="<%= @query %>" type="search" autocomplete="off"> + <%- @Icon('magnifier') %>
<%- @Icon('diagonal-cross') %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 89d8733a8..b6bf082c7 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -9,6 +9,7 @@
+
diff --git a/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco index 491eab3c3..7997f7e8f 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco @@ -1,3 +1,3 @@ -
+
<%- @Icon('cog', 'dropdown-icon') %>
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/user.jst.eco b/app/assets/javascripts/app/views/user.jst.eco index 749c7c019..5ba6cb12a 100644 --- a/app/assets/javascripts/app/views/user.jst.eco +++ b/app/assets/javascripts/app/views/user.jst.eco @@ -12,8 +12,8 @@
- <%- @Icon('magnifier') %> + <%- @Icon('magnifier') %>
diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 755a6dbed..d86c8b006 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -55,6 +55,7 @@ .icon-mute { width: 16px; height: 16px; } .icon-note { width: 16px; height: 16px; } .icon-oauth2-button { width: 29px; height: 24px; } +.icon-office365-button { width: 29px; height: 24px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index ac39a1c4b..6076f7c66 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -398,7 +398,8 @@ pre code.hljs { } &.is-disabled, - &[disabled] { + &[disabled], + &:disabled { pointer-events: none; cursor: not-allowed; opacity: .33; @@ -415,7 +416,7 @@ pre code.hljs { font-size: 12px; letter-spacing: 0.05em; height: 31px; - padding: 2px 11px 0 !important; + padding: 0 11px !important; display: inline-flex; align-items: center; @@ -1623,6 +1624,24 @@ textarea, border-color: hsl(200,71%,59%); box-shadow: 0 0 0 3px hsl(201,62%,90%); } + + &.is-disabled, // .is-disabled should not be used - legacy support + &[disabled], + &[readonly] { + background: hsl(210,17%,93%); + border-color: hsl(210,10%,85%); + + &:focus, + &.focus { + border-color: hsl(200,71%,59%); + } + } + + &.is-disabled, // .is-disabled should not be used + &[disabled] { + cursor: not-allowed; + opacity: 1; + } } input[type=url] { @@ -1700,13 +1719,6 @@ select.form-control:not([multiple]) { display: none; } -.form-control[disabled], .form-control.is-disabled { - cursor: not-allowed; - background-color: #fff; - color: #d5d5d5; - opacity: 1; -} - .form-control.form-control--borderless { border: none; padding: 0; @@ -1860,6 +1872,7 @@ input.has-error { appearance: textfield; border-radius: 19px; padding: 0 17px 0 42px; + will-change: transform; &.is-empty + .empty-search { visibility: hidden; @@ -2550,6 +2563,10 @@ ol.tabs li { background: hsl(0,0%,15%); } + &.auth-provider--office365 { + background: hsl(15,100%,47%); + } + .provider-name { flex: 1; } @@ -2558,7 +2575,6 @@ ol.tabs li { width: 29px; height: 24px; margin-right: 10px; - margin-top: 1px; } } @@ -3956,7 +3972,6 @@ footer { max-width: 400px; min-width: 350px; flex-direction: column; - @extend .zIndex-2; &.is-visible { display: flex; @@ -5483,8 +5498,13 @@ footer { .newTicket .sidebar { width: 290px; } - .newTicket .form-control:not(:focus):not(.focus) { + .newTicket .form-control { border-color: hsl(0,0%,90%); + + &:focus, + &.focus { + border-color: hsl(200,71%,59%); + } } .newTicket .article-form-top { margin-top: 15px; @@ -5964,6 +5984,8 @@ footer { } .dropdown-menu { + @extend .zIndex-5; // has to be behind modal windows and beneath notifications (popover) + position: absolute; margin: 0; padding: 0; min-width: 100%; @@ -6303,15 +6325,18 @@ footer { cursor: default; } -.checkbox.form-group .controls label { - padding: 2px 0; - font: inherit; - font-size: 13px; - margin-bottom: 0; - color: inherit; - text-transform: inherit; - letter-spacing: 0; - @extend .u-clickable; +.checkbox, +.radio { + &.form-group .controls label { + padding: 2px 0; + font: inherit; + font-size: 13px; + margin-bottom: 0; + color: inherit; + text-transform: inherit; + letter-spacing: 0; + @extend .u-clickable; + } } .userSearch-label { @@ -6440,6 +6465,9 @@ footer { @extend .u-textTruncate; } +.wizard { + margin: auto; // makes sure that the wizard is scrollable +} .wizard-logo { fill: white; @@ -6454,6 +6482,10 @@ footer { width: 400px; padding-bottom: 18px; margin-bottom: 20px; + + &.wizard-slide--large { + width: 460px; + } } .wizard h2 { @@ -7178,6 +7210,12 @@ output { .zammad-switch input { display: none; + &[disabled] + label { + cursor: not-allowed; + background: hsl(210,17%,93%); + border-color: hsl(210,10%,85%); + } + &:focus + label { transition: none; background: hsl(200,71%,59%); diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8376b1c68..a51a6ac0c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -126,6 +126,16 @@ class UsersController < ApplicationController if admin_account_exists && !params[:signup] raise Exceptions::UnprocessableEntity, 'Only signup with not authenticate user possible!' end + + # check if user already exists + if clean_params[:email].blank? + raise Exceptions::UnprocessableEntity, 'Attribute \'email\' required!' + end + + # check if user already exists + exists = User.find_by(email: clean_params[:email].downcase.strip) + raise Exceptions::UnprocessableEntity, 'Email address is already used for other user.' if exists + user = User.new(clean_params) user.associations_from_param(params) user.updated_by_id = 1 @@ -165,11 +175,6 @@ class UsersController < ApplicationController user.associations_from_param(params) end - # check if user already exists - if !user.email.empty? - exists = User.where(email: user.email.downcase).first - raise Exceptions::UnprocessableEntity, 'User already exists!' if exists - end user.save! # if first user was added, set system init done @@ -177,7 +182,7 @@ class UsersController < ApplicationController Setting.set('system_init_done', true) # fetch org logo - if !user.email.empty? + if user.email.present? Service::Image.organization_suggest(user.email) end @@ -252,17 +257,17 @@ class UsersController < ApplicationController # only allow Admin's if current_user.permissions?('admin.user') && (params[:role_ids] || params[:roles]) - user.associations_from_param({ role_ids: params[:role_ids], roles: params[:roles] }) + user.associations_from_param(role_ids: params[:role_ids], roles: params[:roles]) end # only allow Admin's if current_user.permissions?('admin.user') && (params[:group_ids] || params[:groups]) - user.associations_from_param({ group_ids: params[:group_ids], groups: params[:groups] }) + user.associations_from_param(group_ids: params[:group_ids], groups: params[:groups]) end # only allow Admin's and Agent's if current_user.permissions?(['admin.user', 'ticket.agent']) && (params[:organization_ids] || params[:organizations]) - user.associations_from_param({ organization_ids: params[:organization_ids], organizations: params[:organizations] }) + user.associations_from_param(organization_ids: params[:organization_ids], organizations: params[:organizations]) end if params[:expand] @@ -363,7 +368,7 @@ class UsersController < ApplicationController limit: params[:limit], current_user: current_user, } - if params[:role_ids] && !params[:role_ids].empty? + if params[:role_ids].present? query_params[:role_ids] = params[:role_ids] end @@ -449,10 +454,10 @@ class UsersController < ApplicationController end # do query - user_all = if params[:role_ids] && !params[:role_ids].empty? - User.joins(:roles).where( 'roles.id' => params[:role_ids] ).where('users.id != 1').order('users.created_at DESC').limit( params[:limit] || 20 ) + user_all = if params[:role_ids].present? + User.joins(:roles).where('roles.id' => params[:role_ids]).where('users.id != 1').order('users.created_at DESC').limit(params[:limit] || 20) else - User.where('id != 1').order('created_at DESC').limit( params[:limit] || 20 ) + User.where('id != 1').order('created_at DESC').limit(params[:limit] || 20) end # build result list diff --git a/app/models/application_model.rb b/app/models/application_model.rb index 551fe482b..c3d267e5f 100644 --- a/app/models/application_model.rb +++ b/app/models/application_model.rb @@ -5,7 +5,7 @@ class ApplicationModel < ActiveRecord::Base include ApplicationModel::HasCache include ApplicationModel::CanLookup include ApplicationModel::CanLookupSearchIndexAttributes - include ApplicationModel::ChecksAttributeLength + include ApplicationModel::ChecksAttributeValuesAndLength include ApplicationModel::CanCleanupParam include ApplicationModel::HasRecentViews include ApplicationModel::ChecksUserColumnsFillup diff --git a/app/models/application_model/checks_attribute_length.rb b/app/models/application_model/checks_attribute_length.rb deleted file mode 100644 index 5254b035c..000000000 --- a/app/models/application_model/checks_attribute_length.rb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ -module ApplicationModel::ChecksAttributeLength - extend ActiveSupport::Concern - - included do - before_create :check_attribute_length - before_update :check_attribute_length - end - -=begin - -check string/varchar size and cut them if needed - -=end - - def check_attribute_length - attributes.each { |attribute| - next if !self[ attribute[0] ] - next if !self[ attribute[0] ].instance_of?(String) - next if self[ attribute[0] ].empty? - column = self.class.columns_hash[ attribute[0] ] - next if !column - limit = column.limit - if column && limit - current_length = attribute[1].to_s.length - if limit < current_length - logger.warn "WARNING: cut string because of database length #{self.class}.#{attribute[0]}(#{limit} but is #{current_length}:#{attribute[1]})" - self[ attribute[0] ] = attribute[1][ 0, limit ] - end - end - - # strip 4 bytes utf8 chars if needed - if column && self[ attribute[0] ] - self[attribute[0]] = self[ attribute[0] ].utf8_to_3bytesutf8 - end - } - true - end -end diff --git a/app/models/application_model/checks_attribute_values_and_length.rb b/app/models/application_model/checks_attribute_values_and_length.rb new file mode 100644 index 000000000..27a680866 --- /dev/null +++ b/app/models/application_model/checks_attribute_values_and_length.rb @@ -0,0 +1,54 @@ +# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ +module ApplicationModel::ChecksAttributeValuesAndLength + extend ActiveSupport::Concern + + included do + before_create :check_attribute_values_and_length + before_update :check_attribute_values_and_length + end + +=begin + +1) check string/varchar size and cut them if needed + +2) check string for null byte \u0000 and remove it + +=end + + def check_attribute_values_and_length + columns = self.class.columns_hash + attributes.each { |name, value| + next if value.blank? + next if !value.instance_of?(String) + column = columns[name] + next if !column + + # strip null byte chars (postgresql will complain about it) + if column.sql_type == 'text' + if Rails.application.config.db_null_byte == false + self[name].delete!("\u0000") + end + end + + # for varchar check length and replace null bytes + limit = column.limit + if limit + current_length = value.length + if limit < current_length + logger.warn "WARNING: cut string because of database length #{self.class}.#{name}(#{limit} but is #{current_length}:#{value})" + self[name] = value[0, limit] + end + + # strip null byte chars (postgresql will complain about it) + if Rails.application.config.db_null_byte == false + self[name].delete!("\u0000") + end + end + + # strip 4 bytes utf8 chars if needed (mysql/mariadb will complain it) + next if self[name].blank? + self[name] = self[name].utf8_to_3bytesutf8 + } + true + end +end diff --git a/app/models/channel/driver/imap.rb b/app/models/channel/driver/imap.rb index d2e0043bc..344b971b9 100644 --- a/app/models/channel/driver/imap.rb +++ b/app/models/channel/driver/imap.rb @@ -52,6 +52,7 @@ example host: 'outlook.office365.com', user: 'xxx@znuny.onmicrosoft.com', password: 'xxx', + keep_on_server: true, } channel = Channel.last instance = Channel::Driver::Imap.new @@ -60,13 +61,18 @@ example =end def fetch (options, channel, check_type = '', verify_string = '') - ssl = true - port = 993 + ssl = true + port = 993 + keep_on_server = false + folder = 'INBOX' + if options[:keep_on_server] == true || options[:keep_on_server] == 'true' + keep_on_server = true + end if options.key?(:ssl) && options[:ssl] == false ssl = false port = 143 end - if options.key?(:port) && !options[:port].empty? + if options.key?(:port) && options[:port].present? port = options[:port] # disable ssl for non ssl ports @@ -74,8 +80,11 @@ example ssl = false end end + if options[:folder].present? + folder = options[:folder] + end - Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl},folder=#{options[:folder]})" + Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl},folder=#{folder},keep_on_server=#{keep_on_server})" # on check, reduce open_timeout to have faster probing timeout = 45 @@ -90,17 +99,17 @@ example @imap.login(options[:user], options[:password]) # select folder - if !options[:folder] || options[:folder].empty? - @imap.select('INBOX') - else - @imap.select(options[:folder]) - end + @imap.select(folder) # sort messages by date on server (if not supported), if not fetch messages via search (first in, first out) + filter = ['ALL'] + if keep_on_server && check_type != 'check' && check_type != 'verify' + filter = %w(NOT SEEN) + end begin - message_ids = @imap.sort(['DATE'], ['ALL'], 'US-ASCII') + message_ids = @imap.sort(['DATE'], filter, 'US-ASCII') rescue - message_ids = @imap.search(['ALL']) + message_ids = @imap.search(filter) end # check mode only @@ -168,9 +177,8 @@ example message_ids.each do |message_id| count += 1 Rails.logger.info " - message #{count}/#{count_all}" - #Rails.logger.info msg.to_s - message_meta = @imap.fetch(message_id, ['RFC822.SIZE', 'FLAGS', 'INTERNALDATE'])[0] + message_meta = @imap.fetch(message_id, ['RFC822.SIZE', 'ENVELOPE', 'FLAGS', 'INTERNALDATE'])[0] # ignore to big messages info = too_big?(message_meta, count, count_all) @@ -182,14 +190,23 @@ example # ignore deleted messages next if deleted?(message_meta, count, count_all) + # ignore already imported + next if already_imported?(message_id, message_meta, count, count_all, keep_on_server) + # delete email from server after article was created msg = @imap.fetch(message_id, 'RFC822')[0].attr['RFC822'] next if !msg process(channel, msg, false) - @imap.store(message_id, '+FLAGS', [:Deleted]) + if !keep_on_server + @imap.store(message_id, '+FLAGS', [:Deleted]) + else + @imap.store(message_id, '+FLAGS', [:Seen]) + end count_fetched += 1 end - @imap.expunge() + if !keep_on_server + @imap.expunge() + end disconnect if count.zero? Rails.logger.info ' - no message' @@ -209,6 +226,20 @@ example private + def already_imported?(message_id, message_meta, count, count_all, keep_on_server) + return false if !keep_on_server + return false if !message_meta.attr + return false if !message_meta.attr['ENVELOPE'] + local_message_id = message_meta.attr['ENVELOPE'].message_id + return false if local_message_id.blank? + local_message_id_md5 = Digest::MD5.hexdigest(local_message_id) + article = Ticket::Article.where(message_id_md5: local_message_id_md5).order('created_at DESC, id DESC').limit(1).first + return false if !article + @imap.store(message_id, '+FLAGS', [:Seen]) + Rails.logger.info " - ignore message #{count}/#{count_all} - because message message id already imported" + true + end + def deleted?(message_meta, count, count_all) return false if !message_meta.attr['FLAGS'].include?(:Deleted) Rails.logger.info " - ignore message #{count}/#{count_all} - because message has already delete flag" diff --git a/app/models/channel/email_build.rb b/app/models/channel/email_build.rb index 3629bfe3a..b0692648f 100644 --- a/app/models/channel/email_build.rb +++ b/app/models/channel/email_build.rb @@ -156,7 +156,9 @@ Check if string is a complete html document. If not, add head and css styles. return html if html =~ //i - Rails.configuration.html_email_body.sub('###html###', html) + # use block form because variable html could contain backslashes and e. g. '\1' that + # must not be handled as back-references for regular expressions + Rails.configuration.html_email_body.sub('###html###') { html } end =begin diff --git a/app/models/cti/log.rb b/app/models/cti/log.rb index c5cdc7519..fa63b7d48 100644 --- a/app/models/cti/log.rb +++ b/app/models/cti/log.rb @@ -358,5 +358,23 @@ returns ) } end + +=begin + +cleanup caller logs + + Cti::Log.cleanup + +optional you can put the max oldest chat entries as argument + + Cti::Log.cleanup(12.months) + +=end + + def self.cleanup(diff = 12.months) + Cti::Log.where('created_at < ?', Time.zone.now - diff).delete_all + true + end + end end diff --git a/app/models/overview.rb b/app/models/overview.rb index 1abc9f2be..57a3490f9 100644 --- a/app/models/overview.rb +++ b/app/models/overview.rb @@ -28,24 +28,37 @@ class Overview < ApplicationModel end def fill_link_on_create - return true if !link.empty? + return true if link.present? self.link = link_name(name) true end def fill_link_on_update - return true if link.empty? return true if !changes['name'] + return true if changes['link'] self.link = link_name(name) true end def link_name(name) - link = name.downcase - link.gsub!(/\s/, '_') - link.gsub!(/[^0-9a-z]/i, '_') - link.gsub!(/_+/, '_') - link + local_link = name.downcase + local_link = local_link.parameterize('_') + local_link.gsub!(/\s/, '_') + local_link.gsub!(/_+/, '_') + local_link = URI.escape(local_link) + if local_link.blank? + local_link = id || rand(999) + end + check = true + while check + exists = Overview.find_by(link: local_link) + if exists && exists.id != id + local_link = "#{local_link}_#{rand(999)}" + else + check = false + end + end + local_link end end diff --git a/app/models/signature.rb b/app/models/signature.rb index 0435e0fff..04053bad0 100644 --- a/app/models/signature.rb +++ b/app/models/signature.rb @@ -2,7 +2,11 @@ class Signature < ApplicationModel include ChecksLatestChangeObserved + include ChecksHtmlSanitized has_many :groups, after_add: :cache_update, after_remove: :cache_update validates :name, presence: true + + sanitized_html :body + end diff --git a/app/models/text_module.rb b/app/models/text_module.rb index 357f0c78b..7fcb7da83 100644 --- a/app/models/text_module.rb +++ b/app/models/text_module.rb @@ -2,10 +2,13 @@ class TextModule < ApplicationModel include ChecksClientNotification + include ChecksHtmlSanitized validates :name, presence: true validates :content, presence: true + sanitized_html :content + =begin load text modules from online diff --git a/app/models/user.rb b/app/models/user.rb index 53355583d..c9896d8dc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -38,7 +38,7 @@ class User < ApplicationModel load 'user/search_index.rb' include User::SearchIndex - before_validation :check_name, :check_email, :check_login, :ensure_password + before_validation :check_name, :check_email, :check_login, :ensure_uniq_email, :ensure_password, :ensure_roles, :ensure_identifier before_create :check_preferences_default, :validate_roles, :domain_based_assignment, :set_locale before_update :check_preferences_default, :validate_roles, :reset_login_failed after_create :avatar_for_email_check @@ -845,7 +845,7 @@ returns def check_email return true if Setting.get('import_mode') - return true if email.empty? + return true if email.blank? self.email = email.downcase.strip return true if id == 1 raise Exceptions::UnprocessableEntity, 'Invalid email' if email !~ /@/ @@ -867,9 +867,9 @@ returns end end - # if no email, complain about missing login - if id != 1 && login.blank? - raise Exceptions::UnprocessableEntity, 'Attribute \'login\' required!' + # generate auto login + if login.blank? + self.login = "auto-#{Time.zone.now.to_i}-#{rand(999_999)}" end # check if login already exists @@ -878,7 +878,7 @@ returns while check exists = User.find_by(login: login) if exists && exists.id != id - self.login = login + rand(999).to_s + self.login = "#{login}#{rand(999)}" else check = false end @@ -886,6 +886,27 @@ returns true end + def ensure_roles + return true if role_ids.present? + self.role_ids = Role.signup_role_ids + end + + def ensure_identifier + return true if email.present? || firstname.present? || lastname.present? || phone.present? + return true if login.present? && !login.start_with?('auto-') + raise Exceptions::UnprocessableEntity, 'Minimum one identifier (login, firstname, lastname, phone or email) for user is required.' + end + + def ensure_uniq_email + return true if Setting.get('user_email_multiple_use') + return true if Setting.get('import_mode') + return true if email.blank? + return true if !changes + return true if !changes['email'] + return true if !User.find_by(email: email.downcase.strip) + raise Exceptions::UnprocessableEntity, 'Email address is already used for other user.' + end + def validate_roles return true if !role_ids role_ids.each { |role_id| diff --git a/config/initializers/db_preferences_mysql.rb b/config/initializers/db_preferences_mysql.rb index 121608f10..9de0ac255 100644 --- a/config/initializers/db_preferences_mysql.rb +++ b/config/initializers/db_preferences_mysql.rb @@ -1,6 +1,7 @@ # mysql if ActiveRecord::Base.connection_config[:adapter] == 'mysql2' Rails.application.config.db_4bytes_utf8 = false + Rails.application.config.db_null_byte = true # mysql version check # mysql example: "5.7.3" diff --git a/config/initializers/db_preferences_postgresql.rb b/config/initializers/db_preferences_postgresql.rb index 8f72504c4..b62f7082c 100644 --- a/config/initializers/db_preferences_postgresql.rb +++ b/config/initializers/db_preferences_postgresql.rb @@ -2,6 +2,7 @@ if ActiveRecord::Base.connection_config[:adapter] == 'postgresql' Rails.application.config.db_case_sensitive = true Rails.application.config.db_like = 'ILIKE' + Rails.application.config.db_null_byte = false # postgresql version check # example output: "9.5.0" diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 6436d6aad..ea2793497 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -32,9 +32,11 @@ Rails.application.config.middleware.use OmniAuth::Builder do authorize_url: '/oauth/authorize', token_url: '/oauth/token' }, - scope: 'read_user', } + # microsoft_office365 database connect + provider :microsoft_office365_database, 'not_change_will_be_set_by_database', 'not_change_will_be_set_by_database' + # oauth2 database connect provider :oauth2_database, 'not_change_will_be_set_by_database', 'not_change_will_be_set_by_database', { client_options: { diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch index 6ec311680..2a6135cec 100644 Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf index 7bb4fcc25..279d35f51 100644 --- a/contrib/nginx/zammad.conf +++ b/contrib/nginx/zammad.conf @@ -33,6 +33,7 @@ server { proxy_set_header Connection "Upgrade"; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } @@ -41,6 +42,7 @@ server { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 180; proxy_pass http://zammad; diff --git a/contrib/nginx/zammad_ssl.conf b/contrib/nginx/zammad_ssl.conf index 248790af3..de55f36ed 100644 --- a/contrib/nginx/zammad_ssl.conf +++ b/contrib/nginx/zammad_ssl.conf @@ -124,6 +124,7 @@ server { proxy_set_header Connection "Upgrade"; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } @@ -132,6 +133,7 @@ server { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 180; proxy_pass http://zammad; diff --git a/db/migrate/20170713000001_omniauth_office365_setting.rb b/db/migrate/20170713000001_omniauth_office365_setting.rb new file mode 100644 index 000000000..147dbd508 --- /dev/null +++ b/db/migrate/20170713000001_omniauth_office365_setting.rb @@ -0,0 +1,63 @@ +class OmniauthOffice365Setting < ActiveRecord::Migration + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + Setting.create_if_not_exists( + title: 'Authentication via %s', + name: 'auth_microsoft_office365', + area: 'Security::ThirdPartyAuthentication', + description: 'Enables user authentication via %s. Register your app first at [%s](%s).', + options: { + form: [ + { + display: '', + null: true, + name: 'auth_microsoft_office365', + tag: 'boolean', + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + preferences: { + controller: 'SettingsAreaSwitch', + sub: ['auth_microsoft_office365_credentials'], + title_i18n: ['Office 365'], + description_i18n: ['Office 365', 'Microsoft Application Registration Portal', 'https://apps.dev.microsoft.com'], + permission: ['admin.security'], + }, + state: false, + frontend: true + ) + Setting.create_if_not_exists( + title: 'Office 365 App Credentials', + name: 'auth_microsoft_office365_credentials', + area: 'Security::ThirdPartyAuthentication::Office365', + description: 'Enables user authentication via Office 365.', + options: { + form: [ + { + display: 'App ID', + null: true, + name: 'app_id', + tag: 'input', + }, + { + display: 'App Secret', + null: true, + name: 'app_secret', + tag: 'input', + }, + ], + }, + state: {}, + preferences: { + permission: ['admin.security'], + }, + frontend: false + ) + end +end diff --git a/db/migrate/20170630000001_ticket_zoom_setting.rb b/db/migrate/20170713000002_ticket_zoom_setting2.rb similarity index 74% rename from db/migrate/20170630000001_ticket_zoom_setting.rb rename to db/migrate/20170713000002_ticket_zoom_setting2.rb index 9966132fd..8147edc1f 100644 --- a/db/migrate/20170630000001_ticket_zoom_setting.rb +++ b/db/migrate/20170713000002_ticket_zoom_setting2.rb @@ -1,4 +1,4 @@ -class TicketZoomSetting < ActiveRecord::Migration +class TicketZoomSetting2 < ActiveRecord::Migration def up # return if it's a new setup @@ -67,6 +67,33 @@ class TicketZoomSetting < ActiveRecord::Migration }, frontend: true ) + Setting.create_if_not_exists( + title: 'Email - full quote', + name: 'ui_ticket_zoom_article_email_full_quote', + area: 'UI::TicketZoom', + description: 'Enable if you want to quote the full email in your answer. The quoted email will be put at the end of your answer. If you just want to quote a certain phrase, just mark the text and press reply (this feature is always available).', + options: { + form: [ + { + display: '', + null: true, + name: 'ui_ticket_zoom_article_email_full_quote', + tag: 'boolean', + translate: true, + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + state: false, + preferences: { + prio: 220, + permission: ['admin.ui'], + }, + frontend: true + ) Setting.create_if_not_exists( title: 'Twitter - tweet initials', name: 'ui_ticket_zoom_article_twitter_initials', diff --git a/db/migrate/20170714000001_object_manager_user_email_optional.rb b/db/migrate/20170714000001_object_manager_user_email_optional.rb new file mode 100644 index 000000000..4536130b6 --- /dev/null +++ b/db/migrate/20170714000001_object_manager_user_email_optional.rb @@ -0,0 +1,54 @@ +class ObjectManagerUserEmailOptional < ActiveRecord::Migration + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + ObjectManager::Attribute.add( + force: true, + object: 'User', + name: 'email', + display: 'Email', + data_type: 'input', + data_option: { + type: 'email', + maxlength: 150, + null: true, + item_class: 'formGroup--halfSize', + }, + editable: false, + active: true, + screens: { + signup: { + '-all-' => { + null: false, + }, + }, + invite_agent: { + '-all-' => { + null: false, + }, + }, + invite_customer: { + '-all-' => { + null: false, + }, + }, + edit: { + '-all-' => { + null: true, + }, + }, + view: { + '-all-' => { + shown: true, + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 400, + ) + end +end diff --git a/db/migrate/20170714000002_user_email_multiple_use.rb b/db/migrate/20170714000002_user_email_multiple_use.rb new file mode 100644 index 000000000..5d89d8d59 --- /dev/null +++ b/db/migrate/20170714000002_user_email_multiple_use.rb @@ -0,0 +1,34 @@ +class UserEmailMultipleUse < ActiveRecord::Migration + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Setting.create_if_not_exists( + title: 'User email for muliple users', + name: 'user_email_multiple_use', + area: 'Model::User', + description: 'Allow to use email address for muliple users.', + options: { + form: [ + { + display: '', + null: true, + name: 'user_email_multiple_use', + tag: 'boolean', + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + state: false, + preferences: { + permission: ['admin'], + }, + frontend: false + ) + end + +end diff --git a/db/migrate/20170714000003_cleanup_cti_log.rb b/db/migrate/20170714000003_cleanup_cti_log.rb new file mode 100644 index 000000000..4b9e59cbe --- /dev/null +++ b/db/migrate/20170714000003_cleanup_cti_log.rb @@ -0,0 +1,18 @@ +class CleanupCtiLog < ActiveRecord::Migration + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Scheduler.create_if_not_exists( + name: 'Cleanup Cti::Log', + method: 'Cti::Log.cleanup', + period: 1.month, + prio: 2, + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + end + +end diff --git a/db/seeds/object_manager_attributes.rb b/db/seeds/object_manager_attributes.rb index 420d4f3ee..e622a82e8 100644 --- a/db/seeds/object_manager_attributes.rb +++ b/db/seeds/object_manager_attributes.rb @@ -604,7 +604,7 @@ ObjectManager::Attribute.add( data_option: { type: 'email', maxlength: 150, - null: false, + null: true, item_class: 'formGroup--halfSize', }, editable: false, @@ -627,7 +627,7 @@ ObjectManager::Attribute.add( }, edit: { '-all-' => { - null: false, + null: true, }, }, view: { diff --git a/db/seeds/schedulers.rb b/db/seeds/schedulers.rb index 94fbe49f6..659e610f3 100644 --- a/db/seeds/schedulers.rb +++ b/db/seeds/schedulers.rb @@ -156,6 +156,15 @@ Scheduler.create_if_not_exists( updated_by_id: 1, created_by_id: 1, ) +Scheduler.create_if_not_exists( + name: 'Cleanup Cti::Log', + method: 'Cti::Log.cleanup', + period: 1.month, + prio: 2, + active: true, + updated_by_id: 1, + created_by_id: 1, +) Scheduler.create_if_not_exists( name: 'Import Jobs', method: 'ImportJob.start_registered', diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 73b3b7797..606dd2754 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -600,6 +600,33 @@ Setting.create_if_not_exists( }, frontend: true ) +Setting.create_if_not_exists( + title: 'Email - full quote', + name: 'ui_ticket_zoom_article_email_full_quote', + area: 'UI::TicketZoom', + description: 'Enable if you want to quote the full email in your answer. The quoted email will be put at the end of your answer. If you just want to quote a certain phrase, just mark the text and press reply (this feature is always available).', + options: { + form: [ + { + display: '', + null: true, + name: 'ui_ticket_zoom_article_email_full_quote', + tag: 'boolean', + translate: true, + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + state: false, + preferences: { + prio: 220, + permission: ['admin.ui'], + }, + frontend: true +) Setting.create_if_not_exists( title: 'Twitter - tweet initials', name: 'ui_ticket_zoom_article_twitter_initials', @@ -678,6 +705,31 @@ Setting.create_if_not_exists( }, frontend: true ) +Setting.create_if_not_exists( + title: 'User email for muliple users', + name: 'user_email_multiple_use', + area: 'Model::User', + description: 'Allow to use email address for muliple users.', + options: { + form: [ + { + display: '', + null: true, + name: 'user_email_multiple_use', + tag: 'boolean', + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + state: false, + preferences: { + permission: ['admin'], + }, + frontend: false +) Setting.create_if_not_exists( title: 'Authentication via %s', name: 'auth_ldap', @@ -1057,6 +1109,63 @@ Setting.create_if_not_exists( frontend: false ) +Setting.create_if_not_exists( + title: 'Authentication via %s', + name: 'auth_microsoft_office365', + area: 'Security::ThirdPartyAuthentication', + description: 'Enables user authentication via %s. Register your app first at [%s](%s).', + options: { + form: [ + { + display: '', + null: true, + name: 'auth_microsoft_office365', + tag: 'boolean', + options: { + true => 'yes', + false => 'no', + }, + }, + ], + }, + preferences: { + controller: 'SettingsAreaSwitch', + sub: ['auth_microsoft_office365_credentials'], + title_i18n: ['Office 365'], + description_i18n: ['Office 365', 'Microsoft Application Registration Portal', 'https://apps.dev.microsoft.com'], + permission: ['admin.security'], + }, + state: false, + frontend: true +) +Setting.create_if_not_exists( + title: 'Office 365 App Credentials', + name: 'auth_microsoft_office365_credentials', + area: 'Security::ThirdPartyAuthentication::Office365', + description: 'Enables user authentication via Office 365.', + options: { + form: [ + { + display: 'App ID', + null: true, + name: 'app_id', + tag: 'input', + }, + { + display: 'App Secret', + null: true, + name: 'app_secret', + tag: 'input', + }, + ], + }, + state: {}, + preferences: { + permission: ['admin.security'], + }, + frontend: false +) + Setting.create_if_not_exists( title: 'Authentication via %s', name: 'auth_oauth2', @@ -1116,7 +1225,7 @@ Setting.create_if_not_exists( null: true, name: 'site', tag: 'input', - placeholder: 'https://gitlab.YOURDOMAIN.com', + placeholder: 'https://oauth.YOURDOMAIN.com', }, { display: 'authorize_url', diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb index 6552f3e99..f93035d93 100644 --- a/lib/core_ext/string.rb +++ b/lib/core_ext/string.rb @@ -81,7 +81,7 @@ class String def html2text(string_only = false, strict = false) string = "#{self}" # rubocop:disable Style/UnneededInterpolation - # in case of invalid encodeing, strip invalid chars + # in case of invalid encoding, strip invalid chars # see also test/fixtures/mail21.box # note: string.encode!('UTF-8', 'UTF-8', :invalid => :replace, :replace => '?') was not detecting invalid chars if !string.valid_encoding? diff --git a/lib/stats/ticket_reopen.rb b/lib/stats/ticket_reopen.rb index 38b3afacc..360d549d4 100644 --- a/lib/stats/ticket_reopen.rb +++ b/lib/stats/ticket_reopen.rb @@ -66,6 +66,7 @@ class Stats::TicketReopen def self.log(object, o_id, changes, updated_by_id) return if object != 'Ticket' ticket = Ticket.lookup(id: o_id) + return if !ticket # check if close_at is already set / if not, ticket is not reopend return if !ticket.close_at diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee index f9a7d216d..2118ff1aa 100644 --- a/public/assets/chat/chat.coffee +++ b/public/assets/chat/chat.coffee @@ -197,6 +197,23 @@ do($ = window.jQuery, window) -> 'Since you didn\'t respond in the last %s minutes your conversation with %s got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit %s geschlossen.' 'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.' 'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!' + 'es' + 'Chat with us!': 'Chatee con nosotros!' + 'Scroll down to see new messages': 'Haga scroll hacia abajo para ver nuevos mensajes' + 'Online': 'En linea' + 'Online': 'En linea' + 'Offline': 'Desconectado' + 'Connecting': 'Conectando' + 'Connection re-established': 'Conexión restablecida' + 'Today': 'Hoy' + 'Send': 'Enviar' + 'Compose your message...': 'Escriba su mensaje...' + 'All colleagues are busy.': 'Todos los agentes están ocupados.' + 'You are on waiting list position %s.': 'Usted está en la posición %s de la lista de espera.' + 'Start new conversation': 'Iniciar nueva conversación' + 'Since you didn\'t respond in the last %s minutes your conversation with %s got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación con %s se ha cerrado.' + 'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación se ha cerrado.' + 'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Lo sentimos, se tarda más tiempo de lo esperado para ser atendido por un agente. Inténtelo de nuevo más tarde o envíenos un correo electrónico. ¡Gracias!' 'fr': 'Chat with us!': 'Chattez avec nous!' 'Scroll down to see new messages': 'Faites défiler pour lire les nouveaux messages' @@ -251,6 +268,11 @@ do($ = window.jQuery, window) -> sessionId: undefined scrolledToBottom: true scrollSnapTolerance: 10 + richTextFormatKey: + 66: true # b + 73: true # i + 85: true # u + 83: true # s T: (string, items...) => if @options.lang && @options.lang isnt 'en' @@ -367,9 +389,211 @@ do($ = window.jQuery, window) -> @el.find('.zammad-chat-controls').on 'submit', @onSubmit @el.find('.zammad-chat-body').on 'scroll', @detectScrolledtoBottom @el.find('.zammad-scroll-hint').click @onScrollHintClick - @input.on + @input.on( keydown: @checkForEnter input: @onInput + ) + @input.on('keydown', (e) => + richtTextControl = false + if !e.altKey && !e.ctrlKey && e.metaKey + richtTextControl = true + else if !e.altKey && e.ctrlKey && !e.metaKey + richtTextControl = true + + if richtTextControl && @richTextFormatKey[ e.keyCode ] + e.preventDefault() + if e.keyCode is 66 + document.execCommand('bold') + return true + if e.keyCode is 73 + document.execCommand('italic') + return true + if e.keyCode is 85 + document.execCommand('underline') + return true + if e.keyCode is 83 + document.execCommand('strikeThrough') + return true + ) + @input.on('paste', (e) => + e.stopPropagation() + e.preventDefault() + + clipboardData + if e.clipboardData + clipboardData = e.clipboardData + else if window.clipboardData + clipboardData = window.clipboardData + else if e.originalEvent.clipboardData + clipboardData = e.originalEvent.clipboardData + else + throw 'No clipboardData support' + + imageInserted = false + if clipboardData && clipboardData.items && clipboardData.items[0] + item = clipboardData.items[0] + if item.kind == 'file' && (item.type == 'image/png' || item.type == 'image/jpeg') + imageFile = item.getAsFile() + reader = new FileReader() + + reader.onload = (e) => + result = e.target.result + img = document.createElement('img') + img.src = result + + insert = (dataUrl, width, height, isRetina) => + + # adapt image if we are on retina devices + if @isRetina() + width = width / 2 + height = height / 2 + result = dataUrl + img = "" + document.execCommand('insertHTML', false, img) + + # resize if to big + @resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert) + + reader.readAsDataURL(imageFile) + imageInserted = true + + return if imageInserted + + # check existing + paste text for limit + text = undefined + docType = undefined + try + text = clipboardData.getData('text/html') + docType = 'html' + if !text || text.length is 0 + docType = 'text' + text = clipboardData.getData('text/plain') + if !text || text.length is 0 + docType = 'text2' + text = clipboardData.getData('text') + catch e + console.log('Sorry, can\'t insert markup because browser is not supporting it.') + docType = 'text3' + text = clipboardData.getData('text') + + if docType is 'text' || docType is 'text2' || docType is 'text3' + text = '
' + text.replace(/\n/g, '
') + '
' + text = text.replace(/
<\/div>/g, '

') + console.log('p', docType, text) + if docType is 'html' + html = $("
#{text}
") + match = false + htmlTmp = text + regex = new RegExp('<(/w|w)\:[A-Za-z]') + if htmlTmp.match(regex) + match = true + htmlTmp = htmlTmp.replace(regex, '') + regex = new RegExp('<(/o|o)\:[A-Za-z]') + if htmlTmp.match(regex) + match = true + htmlTmp = htmlTmp.replace(regex, '') + if match + html = @wordFilter(html) + #html + + html = $(html) + + html.contents().each( -> + if @nodeType == 8 + $(@).remove() + ) + + # remove tags, keep content + html.find('a, font, small, time, form, label').replaceWith( -> + $(@).contents() + ) + + # replace tags with generic div + # New type of the tag + replacementTag = 'div'; + + # Replace all x tags with the type of replacementTag + html.find('textarea').each( -> + outer = @outerHTML + + # Replace opening tag + regex = new RegExp('<' + @tagName, 'i') + newTag = outer.replace(regex, '<' + replacementTag) + + # Replace closing tag + regex = new RegExp(' + e.stopPropagation() + e.preventDefault() + + dataTransfer + if window.dataTransfer # ie + dataTransfer = window.dataTransfer + else if e.originalEvent.dataTransfer # other browsers + dataTransfer = e.originalEvent.dataTransfer + else + throw 'No clipboardData support' + + x = e.clientX + y = e.clientY + file = dataTransfer.files[0] + + # look for images + if file.type.match('image.*') + reader = new FileReader() + reader.onload = (e) => + result = e.target.result + img = document.createElement('img') + img.src = result + + # Insert the image at the carat + insert = (dataUrl, width, height, isRetina) => + + # adapt image if we are on retina devices + if @isRetina() + width = width / 2 + height = height / 2 + + result = dataUrl + img = $("") + img = img.get(0) + + if document.caretPositionFromPoint + pos = document.caretPositionFromPoint(x, y) + range = document.createRange() + range.setStart(pos.offsetNode, pos.offset) + range.collapse() + range.insertNode(img) + else if document.caretRangeFromPoint + range = document.caretRangeFromPoint(x, y) + range.insertNode(img) + else + console.log('could not find carat') + + # resize if to big + @resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert) + reader.readAsDataURL(file) + ) + $(window).on('beforeunload', => @onLeaveTemporary() ) @@ -471,7 +695,7 @@ do($ = window.jQuery, window) -> from: if message.created_by_id then 'agent' else 'customer' if unfinishedMessage - @input.val unfinishedMessage + @input.html(unfinishedMessage) # show wait list if data.position @@ -489,7 +713,7 @@ do($ = window.jQuery, window) -> @el.find('.zammad-chat-message--unread') .removeClass 'zammad-chat-message--unread' - sessionStorage.setItem 'unfinished_message', @input.val() + sessionStorage.setItem 'unfinished_message', @input.html() @onTyping() @@ -520,7 +744,7 @@ do($ = window.jQuery, window) -> @sendMessage() sendMessage: -> - message = @input.val() + message = @input.html() return if !message @inactiveTimeout.start() @@ -543,7 +767,7 @@ do($ = window.jQuery, window) -> @lastAddedType = 'message--customer' @el.find('.zammad-chat-body').append messageElement - @input.val('') + @input.html('') @scrollToBottom() # send message event @@ -585,11 +809,6 @@ do($ = window.jQuery, window) -> @el.addClass('zammad-chat-is-open') - if !@inputInitialized - @inputInitialized = true - @input.autoGrow - extraLine: false - remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight() @el.css 'bottom', -remainerHeight @@ -1032,4 +1251,204 @@ do($ = window.jQuery, window) -> else if direction is 'horizontal' return !!clientSize && ((compareRight <= viewRight) && (compareLeft >= viewLeft)) + isRetina: -> + if window.matchMedia + mq = window.matchMedia('only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)') + return (mq && mq.matches || (window.devicePixelRatio > 1)) + false + + resizeImage: (dataURL, x = 'auto', y = 'auto', sizeFactor = 1, type, quallity, callback, force = true) -> + + # load image from data url + imageObject = new Image() + imageObject.onload = -> + imageWidth = imageObject.width + imageHeight = imageObject.height + console.log('ImageService', 'current size', imageWidth, imageHeight) + if y is 'auto' && x is 'auto' + x = imageWidth + y = imageHeight + + # get auto dimensions + if y is 'auto' + factor = imageWidth / x + y = imageHeight / factor + + if x is 'auto' + factor = imageWidth / y + x = imageHeight / factor + + # check if resize is needed + resize = false + if x < imageWidth || y < imageHeight + resize = true + x = x * sizeFactor + y = y * sizeFactor + else + x = imageWidth + y = imageHeight + + # create canvas and set dimensions + canvas = document.createElement('canvas') + canvas.width = x + canvas.height = y + + # draw image on canvas and set image dimensions + context = canvas.getContext('2d') + context.drawImage(imageObject, 0, 0, x, y) + + # set quallity based on image size + if quallity == 'auto' + if x < 200 && y < 200 + quallity = 1 + else if x < 400 && y < 400 + quallity = 0.9 + else if x < 600 && y < 600 + quallity = 0.8 + else if x < 900 && y < 900 + quallity = 0.7 + else + quallity = 0.6 + + # execute callback with resized image + newDataUrl = canvas.toDataURL(type, quallity) + if resize + console.log('ImageService', 'resize', x/sizeFactor, y/sizeFactor, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb') + callback(newDataUrl, x/sizeFactor, y/sizeFactor, true) + return + console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb') + callback(newDataUrl, x, y, false) + + # load image from data url + imageObject.src = dataURL + + # taken from https://stackoverflow.com/questions/6690752/insert-html-at-caret-in-a-contenteditable-div/6691294#6691294 + pasteHtmlAtCaret: (html) -> + sel = undefined + range = undefined + if window.getSelection + sel = window.getSelection() + if sel.getRangeAt && sel.rangeCount + range = sel.getRangeAt(0) + range.deleteContents() + + el = document.createElement('div') + el.innerHTML = html + frag = document.createDocumentFragment(node, lastNode) + while node = el.firstChild + lastNode = frag.appendChild(node) + range.insertNode(frag) + + if lastNode + range = range.cloneRange() + range.setStartAfter(lastNode) + range.collapse(true) + sel.removeAllRanges() + sel.addRange(range) + else if document.selection && document.selection.type != 'Control' + document.selection.createRange().pasteHTML(html) + + # (C) sbrin - https://github.com/sbrin + # https://gist.github.com/sbrin/6801034 + wordFilter: (editor) -> + content = editor.html() + + # Word comments like conditional comments etc + content = content.replace(//gi, '') + + # Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, + # MS Office namespaced tags, and a few other tags + content = content.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, '') + + # Convert into for line-though + content = content.replace(/<(\/?)s>/gi, '<$1strike>') + + # Replace nbsp entites to char since it's easier to handle + # content = content.replace(/ /gi, "\u00a0") + content = content.replace(/ /gi, ' ') + + # Convert ___ to string of alternating + # breaking/non-breaking spaces of same length + #content = content.replace(/([\s\u00a0]*)<\/span>/gi, (str, spaces) -> + # return (spaces.length > 0) ? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : '' + #) + + editor.html(content) + + # Parse out list indent level for lists + $('p', editor).each( -> + str = $(@).attr('style') + matches = /mso-list:\w+ \w+([0-9]+)/.exec(str) + if matches + $(@).data('_listLevel', parseInt(matches[1], 10)) + ) + + # Parse Lists + last_level = 0 + pnt = null + $('p', editor).each(-> + cur_level = $(@).data('_listLevel') + if cur_level != undefined + txt = $(@).text() + list_tag = '
    ' + if (/^\s*\w+\./.test(txt)) + matches = /([0-9])\./.exec(txt) + if matches + start = parseInt(matches[1], 10) + list_tag = start>1 ? '
      ' : '
        ' + else + list_tag = '
          ' + + if cur_level > last_level + if last_level == 0 + $(@).before(list_tag) + pnt = $(@).prev() + else + pnt = $(list_tag).appendTo(pnt) + + if cur_level < last_level + for i in [i..last_level-cur_level] + pnt = pnt.parent() + + $('span:first', @).remove() + pnt.append('
        1. ' + $(@).html() + '
          2. ') + $(@).remove() + last_level = cur_level + else + last_level = 0 + ) + + $('[style]', editor).removeAttr('style') + $('[align]', editor).removeAttr('align') + $('span', editor).replaceWith(-> + $(@).contents() + ) + $('span:empty', editor).remove() + $("[class^='Mso']", editor).removeAttr('class') + $('p:empty', editor).remove() + editor + + removeAttribute: (element) -> + return if !element + $element = $(element) + for att in element.attributes + if att && att.name + element.removeAttribute(att.name) + #$element.removeAttr(att.name) + + $element.removeAttr('style') + .removeAttr('class') + .removeAttr('lang') + .removeAttr('type') + .removeAttr('align') + .removeAttr('id') + .removeAttr('wrap') + .removeAttr('title') + + removeAttributes: (html, parent = true) => + if parent + html.each((index, element) => @removeAttribute(element) ) + html.find('*').each((index, element) => @removeAttribute(element) ) + html + window.ZammadChat = ZammadChat diff --git a/public/assets/chat/chat.css b/public/assets/chat/chat.css index 451ca8b09..255fa5b7a 100644 --- a/public/assets/chat/chat.css +++ b/public/assets/chat/chat.css @@ -320,9 +320,9 @@ .zammad-chat-controls { overflow: hidden; display: none; - -webkit-align-items: flex-start; - -ms-flex-align: start; - align-items: flex-start; + -webkit-align-items: flex-end; + -ms-flex-align: end; + align-items: flex-end; border-top: 1px solid #ededed; padding: 0; margin: 0; @@ -340,25 +340,23 @@ margin: 0; padding: 1em 2em; float: left; - width: auto; - height: auto; max-height: 6em; - min-height: 1.4em !important; + min-height: 1.4em; font-family: inherit; line-height: 1.4em; font-size: inherit; -webkit-appearance: none; -moz-appearance: none; appearance: none; - border: none !important; + border: none; background: none; - box-shadow: none !important; + box-shadow: none; box-sizing: content-box; outline: none; - resize: none; -webkit-flex: 1; -ms-flex: 1; - flex: 1; } + flex: 1; + overflow: auto; } .zammad-chat-input::-webkit-input-placeholder { color: #d9d9d9; } @@ -373,7 +371,7 @@ background: #379ad7; color: white; padding: 0.5em 1.2em; - margin: 0.5em 1em 0.5em; + margin: 0.63em 1em; cursor: pointer; border: none; border-radius: 1.5em; diff --git a/public/assets/chat/chat.js b/public/assets/chat/chat.js index 3bdb1803c..7526115be 100644 --- a/public/assets/chat/chat.js +++ b/public/assets/chat/chat.js @@ -1,3 +1,64 @@ +if (!window.zammadChatTemplates) { + window.zammadChatTemplates = {}; +} +window.zammadChatTemplates["agent"] = function (__obj) { + if (!__obj) __obj = {}; + var __out = [], __capture = function(callback) { + var out = __out, result; + __out = []; + callback.call(this); + result = __out.join(''); + __out = out; + return __safe(result); + }, __sanitize = function(value) { + if (value && value.ecoSafe) { + return value; + } else if (typeof value !== 'undefined' && value != null) { + return __escape(value); + } else { + return ''; + } + }, __safe, __objSafe = __obj.safe, __escape = __obj.escape; + __safe = __obj.safe = function(value) { + if (value && value.ecoSafe) { + return value; + } else { + if (!(typeof value !== 'undefined' && value != null)) value = ''; + var result = new String(value); + result.ecoSafe = true; + return result; + } + }; + if (!__escape) { + __escape = __obj.escape = function(value) { + return ('' + value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"'); + }; + } + (function() { + (function() { + if (this.agent.avatar) { + __out.push('\n\n'); + } + + __out.push('\n\n '); + + __out.push(__sanitize(this.agent.name)); + + __out.push('\n'); + + }).call(this); + + }).call(__obj); + __obj.safe = __objSafe, __obj.escape = __escape; + return __out.join(''); +}; + var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, slice = [].slice, extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, @@ -60,7 +121,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; Log.prototype.log = function(level, items) { - var i, item, len, logString; + var item, j, len, logString; items.unshift('||'); items.unshift(level); items.unshift(this.options.logPrefix); @@ -69,8 +130,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); return; } logString = ''; - for (i = 0, len = items.length; i < len; i++) { - item = items[i]; + for (j = 0, len = items.length; j < len; j++) { + item = items[j]; logString += ' '; if (typeof item === 'object') { logString += JSON.stringify(item); @@ -173,11 +234,11 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); })(this); this.ws.onmessage = (function(_this) { return function(e) { - var i, len, pipe, pipes; + var j, len, pipe, pipes; pipes = JSON.parse(e.data); _this.log.debug('onMessage', e.data); - for (i = 0, len = pipes.length; i < len; i++) { - pipe = pipes[i]; + for (j = 0, len = pipes.length; j < len; j++) { + pipe = pipes[j]; if (pipe.event === 'pong') { _this.ping(); } @@ -386,8 +447,15 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); ZammadChat.prototype.scrollSnapTolerance = 10; + ZammadChat.prototype.richTextFormatKey = { + 66: true, + 73: true, + 85: true, + 83: true + }; + ZammadChat.prototype.T = function() { - var i, item, items, len, string, translations; + var item, items, j, len, string, translations; string = arguments[0], items = 2 <= arguments.length ? slice.call(arguments, 1) : []; if (this.options.lang && this.options.lang !== 'en') { if (!this.translations[this.options.lang]) { @@ -401,8 +469,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); } } if (items) { - for (i = 0, len = items.length; i < len; i++) { - item = items[i]; + for (j = 0, len = items.length; j < len; j++) { + item = items[j]; string = string.replace(/%s/, item); } } @@ -425,6 +493,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; function ZammadChat(options) { + this.removeAttributes = bind(this.removeAttributes, this); this.startTimeoutObservers = bind(this.startTimeoutObservers, this); this.onCssLoaded = bind(this.onCssLoaded, this); this.setAgentOnlineState = bind(this.setAgentOnlineState, this); @@ -552,6 +621,203 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); keydown: this.checkForEnter, input: this.onInput }); + this.input.on('keydown', (function(_this) { + return function(e) { + var richtTextControl; + richtTextControl = false; + if (!e.altKey && !e.ctrlKey && e.metaKey) { + richtTextControl = true; + } else if (!e.altKey && e.ctrlKey && !e.metaKey) { + richtTextControl = true; + } + if (richtTextControl && _this.richTextFormatKey[e.keyCode]) { + e.preventDefault(); + if (e.keyCode === 66) { + document.execCommand('bold'); + return true; + } + if (e.keyCode === 73) { + document.execCommand('italic'); + return true; + } + if (e.keyCode === 85) { + document.execCommand('underline'); + return true; + } + if (e.keyCode === 83) { + document.execCommand('strikeThrough'); + return true; + } + } + }; + })(this)); + this.input.on('paste', (function(_this) { + return function(e) { + var clipboardData, docType, error, html, htmlTmp, imageFile, imageInserted, item, match, reader, regex, replacementTag, text; + e.stopPropagation(); + e.preventDefault(); + clipboardData; + if (e.clipboardData) { + clipboardData = e.clipboardData; + } else if (window.clipboardData) { + clipboardData = window.clipboardData; + } else if (e.originalEvent.clipboardData) { + clipboardData = e.originalEvent.clipboardData; + } else { + throw 'No clipboardData support'; + } + imageInserted = false; + if (clipboardData && clipboardData.items && clipboardData.items[0]) { + item = clipboardData.items[0]; + if (item.kind === 'file' && (item.type === 'image/png' || item.type === 'image/jpeg')) { + imageFile = item.getAsFile(); + reader = new FileReader(); + reader.onload = function(e) { + var img, insert, result; + result = e.target.result; + img = document.createElement('img'); + img.src = result; + insert = function(dataUrl, width, height, isRetina) { + if (_this.isRetina()) { + width = width / 2; + height = height / 2; + } + result = dataUrl; + img = ""; + return document.execCommand('insertHTML', false, img); + }; + return _this.resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert); + }; + reader.readAsDataURL(imageFile); + imageInserted = true; + } + } + if (imageInserted) { + return; + } + text = void 0; + docType = void 0; + try { + text = clipboardData.getData('text/html'); + docType = 'html'; + if (!text || text.length === 0) { + docType = 'text'; + text = clipboardData.getData('text/plain'); + } + if (!text || text.length === 0) { + docType = 'text2'; + text = clipboardData.getData('text'); + } + } catch (error) { + e = error; + console.log('Sorry, can\'t insert markup because browser is not supporting it.'); + docType = 'text3'; + text = clipboardData.getData('text'); + } + if (docType === 'text' || docType === 'text2' || docType === 'text3') { + text = '
          ' + text.replace(/\n/g, '
          ') + '
          '; + text = text.replace(/
          <\/div>/g, '

          '); + } + console.log('p', docType, text); + if (docType === 'html') { + html = $("
          " + text + "
          "); + match = false; + htmlTmp = text; + regex = new RegExp('<(/w|w)\:[A-Za-z]'); + if (htmlTmp.match(regex)) { + match = true; + htmlTmp = htmlTmp.replace(regex, ''); + } + regex = new RegExp('<(/o|o)\:[A-Za-z]'); + if (htmlTmp.match(regex)) { + match = true; + htmlTmp = htmlTmp.replace(regex, ''); + } + if (match) { + html = _this.wordFilter(html); + } + html = $(html); + html.contents().each(function() { + if (this.nodeType === 8) { + return $(this).remove(); + } + }); + html.find('a, font, small, time, form, label').replaceWith(function() { + return $(this).contents(); + }); + replacementTag = 'div'; + html.find('textarea').each(function() { + var newTag, outer; + outer = this.outerHTML; + regex = new RegExp('<' + this.tagName, 'i'); + newTag = outer.replace(regex, '<' + replacementTag); + regex = new RegExp('"); + img = img.get(0); + if (document.caretPositionFromPoint) { + pos = document.caretPositionFromPoint(x, y); + range = document.createRange(); + range.setStart(pos.offsetNode, pos.offset); + range.collapse(); + return range.insertNode(img); + } else if (document.caretRangeFromPoint) { + range = document.caretRangeFromPoint(x, y); + return range.insertNode(img); + } else { + return console.log('could not find carat'); + } + }; + return _this.resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert); + }; + return reader.readAsDataURL(file); + } + }; + })(this)); $(window).on('beforeunload', (function(_this) { return function() { return _this.onLeaveTemporary(); @@ -595,9 +861,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; ZammadChat.prototype.onWebSocketMessage = function(pipes) { - var i, len, pipe; - for (i = 0, len = pipes.length; i < len; i++) { - pipe = pipes[i]; + var j, len, pipe; + for (j = 0, len = pipes.length; j < len; j++) { + pipe = pipes[j]; this.log.debug('ws:onmessage', pipe); switch (pipe.event) { case 'chat_error': @@ -683,15 +949,15 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; ZammadChat.prototype.onReopenSession = function(data) { - var i, len, message, ref, unfinishedMessage; + var j, len, message, ref, unfinishedMessage; this.log.debug('old messages', data.session); this.inactiveTimeout.start(); unfinishedMessage = sessionStorage.getItem('unfinished_message'); if (data.agent) { this.onConnectionEstablished(data); ref = data.session; - for (i = 0, len = ref.length; i < len; i++) { - message = ref[i]; + for (j = 0, len = ref.length; j < len; j++) { + message = ref[j]; this.renderMessage({ message: message.content, id: message.id, @@ -699,7 +965,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }); } if (unfinishedMessage) { - this.input.val(unfinishedMessage); + this.input.html(unfinishedMessage); } } if (data.position) { @@ -715,7 +981,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); ZammadChat.prototype.onInput = function() { this.el.find('.zammad-chat-message--unread').removeClass('zammad-chat-message--unread'); - sessionStorage.setItem('unfinished_message', this.input.val()); + sessionStorage.setItem('unfinished_message', this.input.html()); return this.onTyping(); }; @@ -749,7 +1015,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); ZammadChat.prototype.sendMessage = function() { var message, messageElement; - message = this.input.val(); + message = this.input.html(); if (!message) { return; } @@ -769,7 +1035,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); this.lastAddedType = 'message--customer'; this.el.find('.zammad-chat-body').append(messageElement); } - this.input.val(''); + this.input.html(''); this.scrollToBottom(); return this.send('chat_session_message', { content: message, @@ -810,12 +1076,6 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); this.showLoader(); } this.el.addClass('zammad-chat-is-open'); - if (!this.inputInitialized) { - this.inputInitialized = true; - this.input.autoGrow({ - extraLine: false - }); - } remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight(); this.el.css('bottom', -remainerHeight); if (!this.sessionId) { @@ -1328,165 +1588,223 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); } }; + ZammadChat.prototype.isRetina = function() { + var mq; + if (window.matchMedia) { + mq = window.matchMedia('only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)'); + return mq && mq.matches || (window.devicePixelRatio > 1); + } + return false; + }; + + ZammadChat.prototype.resizeImage = function(dataURL, x, y, sizeFactor, type, quallity, callback, force) { + var imageObject; + if (x == null) { + x = 'auto'; + } + if (y == null) { + y = 'auto'; + } + if (sizeFactor == null) { + sizeFactor = 1; + } + if (force == null) { + force = true; + } + imageObject = new Image(); + imageObject.onload = function() { + var canvas, context, factor, imageHeight, imageWidth, newDataUrl, resize; + imageWidth = imageObject.width; + imageHeight = imageObject.height; + console.log('ImageService', 'current size', imageWidth, imageHeight); + if (y === 'auto' && x === 'auto') { + x = imageWidth; + y = imageHeight; + } + if (y === 'auto') { + factor = imageWidth / x; + y = imageHeight / factor; + } + if (x === 'auto') { + factor = imageWidth / y; + x = imageHeight / factor; + } + resize = false; + if (x < imageWidth || y < imageHeight) { + resize = true; + x = x * sizeFactor; + y = y * sizeFactor; + } else { + x = imageWidth; + y = imageHeight; + } + canvas = document.createElement('canvas'); + canvas.width = x; + canvas.height = y; + context = canvas.getContext('2d'); + context.drawImage(imageObject, 0, 0, x, y); + if (quallity === 'auto') { + if (x < 200 && y < 200) { + quallity = 1; + } else if (x < 400 && y < 400) { + quallity = 0.9; + } else if (x < 600 && y < 600) { + quallity = 0.8; + } else if (x < 900 && y < 900) { + quallity = 0.7; + } else { + quallity = 0.6; + } + } + newDataUrl = canvas.toDataURL(type, quallity); + if (resize) { + console.log('ImageService', 'resize', x / sizeFactor, y / sizeFactor, quallity, (newDataUrl.length * 0.75) / 1024 / 1024, 'in mb'); + callback(newDataUrl, x / sizeFactor, y / sizeFactor, true); + return; + } + console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75) / 1024 / 1024, 'in mb'); + return callback(newDataUrl, x, y, false); + }; + return imageObject.src = dataURL; + }; + + ZammadChat.prototype.pasteHtmlAtCaret = function(html) { + var el, frag, lastNode, node, range, sel; + sel = void 0; + range = void 0; + if (window.getSelection) { + sel = window.getSelection(); + if (sel.getRangeAt && sel.rangeCount) { + range = sel.getRangeAt(0); + range.deleteContents(); + el = document.createElement('div'); + el.innerHTML = html; + frag = document.createDocumentFragment(node, lastNode); + while (node = el.firstChild) { + lastNode = frag.appendChild(node); + } + range.insertNode(frag); + if (lastNode) { + range = range.cloneRange(); + range.setStartAfter(lastNode); + range.collapse(true); + sel.removeAllRanges(); + return sel.addRange(range); + } + } + } else if (document.selection && document.selection.type !== 'Control') { + return document.selection.createRange().pasteHTML(html); + } + }; + + ZammadChat.prototype.wordFilter = function(editor) { + var content, last_level, pnt; + content = editor.html(); + content = content.replace(//gi, ''); + content = content.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, ''); + content = content.replace(/<(\/?)s>/gi, '<$1strike>'); + content = content.replace(/ /gi, ' '); + editor.html(content); + $('p', editor).each(function() { + var matches, str; + str = $(this).attr('style'); + matches = /mso-list:\w+ \w+([0-9]+)/.exec(str); + if (matches) { + return $(this).data('_listLevel', parseInt(matches[1], 10)); + } + }); + last_level = 0; + pnt = null; + $('p', editor).each(function() { + var cur_level, i, j, list_tag, matches, ref, ref1, ref2, start, txt; + cur_level = $(this).data('_listLevel'); + if (cur_level !== void 0) { + txt = $(this).text(); + list_tag = '
            '; + if (/^\s*\w+\./.test(txt)) { + matches = /([0-9])\./.exec(txt); + if (matches) { + start = parseInt(matches[1], 10); + list_tag = (ref = start > 1) != null ? ref : '
              ': '
                ' + }; + } else { + list_tag = '
                  '; + } + } + if (cur_level > last_level) { + if (last_level === 0) { + $(this).before(list_tag); + pnt = $(this).prev(); + } else { + pnt = $(list_tag).appendTo(pnt); + } + } + if (cur_level < last_level) { + for (i = j = ref1 = i, ref2 = last_level - cur_level; ref1 <= ref2 ? j <= ref2 : j >= ref2; i = ref1 <= ref2 ? ++j : --j) { + pnt = pnt.parent(); + } + } + $('span:first', this).remove(); + pnt.append('
                1. ' + $(this).html() + '
                  2. '); + $(this).remove(); + return last_level = cur_level; + } else { + return last_level = 0; + } + }); + $('[style]', editor).removeAttr('style'); + $('[align]', editor).removeAttr('align'); + $('span', editor).replaceWith(function() { + return $(this).contents(); + }); + $('span:empty', editor).remove(); + $("[class^='Mso']", editor).removeAttr('class'); + $('p:empty', editor).remove(); + return editor; + }; + + ZammadChat.prototype.removeAttribute = function(element) { + var $element, att, j, len, ref; + if (!element) { + return; + } + $element = $(element); + ref = element.attributes; + for (j = 0, len = ref.length; j < len; j++) { + att = ref[j]; + if (att && att.name) { + element.removeAttribute(att.name); + } + } + return $element.removeAttr('style').removeAttr('class').removeAttr('lang').removeAttr('type').removeAttr('align').removeAttr('id').removeAttr('wrap').removeAttr('title'); + }; + + ZammadChat.prototype.removeAttributes = function(html, parent) { + if (parent == null) { + parent = true; + } + if (parent) { + html.each((function(_this) { + return function(index, element) { + return _this.removeAttribute(element); + }; + })(this)); + } + html.find('*').each((function(_this) { + return function(index, element) { + return _this.removeAttribute(element); + }; + })(this)); + return html; + }; + return ZammadChat; })(Base); return window.ZammadChat = ZammadChat; })(window.jQuery, window); -if (!window.zammadChatTemplates) { - window.zammadChatTemplates = {}; -} -window.zammadChatTemplates["agent"] = function (__obj) { - if (!__obj) __obj = {}; - var __out = [], __capture = function(callback) { - var out = __out, result; - __out = []; - callback.call(this); - result = __out.join(''); - __out = out; - return __safe(result); - }, __sanitize = function(value) { - if (value && value.ecoSafe) { - return value; - } else if (typeof value !== 'undefined' && value != null) { - return __escape(value); - } else { - return ''; - } - }, __safe, __objSafe = __obj.safe, __escape = __obj.escape; - __safe = __obj.safe = function(value) { - if (value && value.ecoSafe) { - return value; - } else { - if (!(typeof value !== 'undefined' && value != null)) value = ''; - var result = new String(value); - result.ecoSafe = true; - return result; - } - }; - if (!__escape) { - __escape = __obj.escape = function(value) { - return ('' + value) - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"'); - }; - } - (function() { - (function() { - if (this.agent.avatar) { - __out.push('\n\n'); - } - - __out.push('\n\n '); - - __out.push(__sanitize(this.agent.name)); - - __out.push('\n'); - - }).call(this); - - }).call(__obj); - __obj.safe = __objSafe, __obj.escape = __escape; - return __out.join(''); -}; - -/*! - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Jevin O. Sewaruth - * ---------------------------------------------------------------------------- - * - * Autogrow Textarea Plugin Version v3.0 - * http://www.technoreply.com/autogrow-textarea-plugin-3-0 - * - * THIS PLUGIN IS DELIVERD ON A PAY WHAT YOU WHANT BASIS. IF THE PLUGIN WAS USEFUL TO YOU, PLEASE CONSIDER BUYING THE PLUGIN HERE : - * https://sites.fastspring.com/technoreply/instant/autogrowtextareaplugin - * - * Date: October 15, 2012 - * - * Zammad modification: - * - remove overflow:hidden when maximum height is reached - * - mirror box-sizing - * - */ - -jQuery.fn.autoGrow = function(options) { - return this.each(function() { - var settings = jQuery.extend({ - extraLine: true, - }, options); - - var createMirror = function(textarea) { - jQuery(textarea).after('
                  '); - return jQuery(textarea).next('.autogrow-textarea-mirror')[0]; - } - - var sendContentToMirror = function (textarea) { - mirror.innerHTML = String(textarea.value) - .replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, ''') - .replace(//g, '>') - .replace(/ /g, ' ') - .replace(/\n/g, '
                  ') + - (settings.extraLine? '.
                  .' : '') - ; - - if (jQuery(textarea).height() != jQuery(mirror).height()) { - jQuery(textarea).height(jQuery(mirror).height()); - - var overflow = jQuery(mirror).height() > maxHeight ? '' : 'hidden'; - jQuery(textarea).css('overflow', overflow); - } - } - - var growTextarea = function () { - sendContentToMirror(this); - } - - // Create a mirror - var mirror = createMirror(this); - - // Store max-height - var maxHeight = parseInt(jQuery(this).css('max-height'), 10); - - // Style the mirror - mirror.style.display = 'none'; - mirror.style.wordWrap = 'break-word'; - mirror.style.whiteSpace = 'normal'; - mirror.style.padding = jQuery(this).css('paddingTop') + ' ' + - jQuery(this).css('paddingRight') + ' ' + - jQuery(this).css('paddingBottom') + ' ' + - jQuery(this).css('paddingLeft'); - - mirror.style.width = jQuery(this).css('width'); - mirror.style.fontFamily = jQuery(this).css('font-family'); - mirror.style.fontSize = jQuery(this).css('font-size'); - mirror.style.lineHeight = jQuery(this).css('line-height'); - mirror.style.letterSpacing = jQuery(this).css('letter-spacing'); - mirror.style.boxSizing = jQuery(this).css('boxSizing'); - - // Style the textarea - this.style.overflow = "hidden"; - this.style.minHeight = this.rows+"em"; - - // Bind the textarea's event - this.onkeyup = growTextarea; - this.onfocus = growTextarea; - - // Fire the event for text already present - sendContentToMirror(this); - - }); -}; if (!window.zammadChatTemplates) { window.zammadChatTemplates = {}; } @@ -1555,11 +1873,11 @@ window.zammadChatTemplates["chat"] = function (__obj) { __out.push(this.T(this.scrollHint)); - __out.push('\n
                  \n
                  \n \n \n
                  \n \n \n
                  ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n '),this.agent?(s.push("\n "),s.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),s.push("\n ")):(s.push("\n "),s.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),s.push("\n ")),s.push('\n
                  \n
                  "),s.push(this.T("Start new conversation")),s.push("
                  \n
                  ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('\n \n \n \n\n'),s.push(this.T("Connecting")),s.push("")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n "),s.push(this.message),s.push("\n
                  ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n
                  \n '),s.push(this.status),s.push("\n
                  \n
                  ")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  '),s.push(n(this.label)),s.push(" "),s.push(n(this.time)),s.push("
                  ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n \n \n \n \n \n \n \n
                  ')}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n \n \n \n \n \n '),s.push(this.T("All colleagues are busy.")),s.push("
                  \n "),s.push(this.T("You are on waiting list position %s.",this.position)),s.push("\n
                  ")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                  \n '),s.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),s.push('\n
                  \n
                  "),s.push(this.T("Start new conversation")),s.push("
                  \n
                  ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")}; \ No newline at end of file +window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.agent=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){this.agent.avatar&&(n.push('\n\n')),n.push('\n\n '),n.push(s(this.agent.name)),n.push("\n")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")};var bind=function(t,e){return function(){return t.apply(e,arguments)}},slice=[].slice,extend=function(t,e){function n(){this.constructor=t}for(var s in e)hasProp.call(e,s)&&(t[s]=e[s]);return n.prototype=e.prototype,t.prototype=new n,t.__super__=e.prototype,t},hasProp={}.hasOwnProperty;!function(t,e){var n,s,i,o,a,r,l,h,d;return d=document.getElementsByTagName("script"),r=d[d.length-1],l=r.src.match(".*://([^:/]*).*")[1],h=r.src.match("(.*)://[^:/]*.*")[1],n=function(){function e(e){this.options=t.extend({},this.defaults,e),this.log=new i({debug:this.options.debug,logPrefix:this.options.logPrefix||this.logPrefix})}return e.prototype.defaults={debug:!1},e}(),i=function(){function e(e){this.log=bind(this.log,this),this.error=bind(this.error,this),this.notice=bind(this.notice,this),this.debug=bind(this.debug,this),this.options=t.extend({},this.defaults,e)}return e.prototype.defaults={debug:!1},e.prototype.debug=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.options.debug?this.log("debug",t):void 0},e.prototype.notice=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("notice",t)},e.prototype.error=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("error",t)},e.prototype.log=function(e,n){var s,i,o,a;if(n.unshift("||"),n.unshift(e),n.unshift(this.options.logPrefix),console.log.apply(console,n),this.options.debug){for(a="",i=0,o=n.length;o>i;i++)s=n[i],a+=" ",a+="object"==typeof s?JSON.stringify(s):s&&s.toString?s.toString():s;return t(".js-chatLogDisplay").prepend("
                  "+a+"
                  ")}},e}(),o=function(t){function e(t){this.stop=bind(this.stop,this),this.start=bind(this.start,this),e.__super__.constructor.call(this,t)}return extend(e,t),e.prototype.timeoutStartedAt=null,e.prototype.logPrefix="timeout",e.prototype.defaults={debug:!1,timeout:4,timeoutIntervallCheck:.5},e.prototype.start=function(){var t,e;return this.stop(),e=new Date,t=function(t){return function(){var n;return n=new Date-new Date(e.getTime()+1e3*t.options.timeout*60),t.log.debug("Timeout check for "+t.options.timeout+" minutes (left "+n/1e3+" sec.)"),0>n?void 0:(t.stop(),t.options.callback())}}(this),this.log.debug("Start timeout in "+this.options.timeout+" minutes"),this.intervallId=setInterval(t,1e3*this.options.timeoutIntervallCheck*60)},e.prototype.stop=function(){return this.intervallId?(this.log.debug("Stop timeout of "+this.options.timeout+" minutes"),clearInterval(this.intervallId)):void 0},e}(n),s=function(t){function n(t){this.ping=bind(this.ping,this),this.send=bind(this.send,this),this.reconnect=bind(this.reconnect,this),this.close=bind(this.close,this),this.connect=bind(this.connect,this),this.set=bind(this.set,this),n.__super__.constructor.call(this,t)}return extend(n,t),n.prototype.logPrefix="io",n.prototype.set=function(t){var e,n,s;n=[];for(e in t)s=t[e],n.push(this.options[e]=s);return n},n.prototype.connect=function(){return this.log.debug("Connecting to "+this.options.host),this.ws=new e.WebSocket(""+this.options.host),this.ws.onopen=function(t){return function(e){return t.log.debug("onOpen",e),t.options.onOpen(e),t.ping()}}(this),this.ws.onmessage=function(t){return function(e){var n,s,i,o;for(o=JSON.parse(e.data),t.log.debug("onMessage",e.data),n=0,s=o.length;s>n;n++)i=o[n],"pong"===i.event&&t.ping();return t.options.onMessage?t.options.onMessage(o):void 0}}(this),this.ws.onclose=function(t){return function(e){if(t.log.debug("close websocket connection",e),t.pingDelayId&&clearTimeout(t.pingDelayId),t.manualClose){if(t.log.debug("manual close, onClose callback"),t.manualClose=!1,t.options.onClose)return t.options.onClose(e)}else if(t.log.debug("error close, onError callback"),t.options.onError)return t.options.onError("Connection lost...")}}(this),this.ws.onerror=function(t){return function(e){return t.log.debug("onError",e),t.options.onError?t.options.onError(e):void 0}}(this)},n.prototype.close=function(){return this.log.debug("close websocket manually"),this.manualClose=!0,this.ws.close()},n.prototype.reconnect=function(){return this.log.debug("reconnect"),this.close(),this.connect()},n.prototype.send=function(t,e){var n;return null==e&&(e={}),this.log.debug("send",t,e),n=JSON.stringify({event:t,data:e}),this.ws.send(n)},n.prototype.ping=function(){var t;return t=function(t){return function(){return t.send("ping")}}(this),this.pingDelayId=setTimeout(t,29e3)},n}(n),a=function(n){function i(n){return this.removeAttributes=bind(this.removeAttributes,this),this.startTimeoutObservers=bind(this.startTimeoutObservers,this),this.onCssLoaded=bind(this.onCssLoaded,this),this.setAgentOnlineState=bind(this.setAgentOnlineState,this),this.onConnectionEstablished=bind(this.onConnectionEstablished,this),this.setSessionId=bind(this.setSessionId,this),this.onConnectionReestablished=bind(this.onConnectionReestablished,this),this.reconnect=bind(this.reconnect,this),this.destroy=bind(this.destroy,this),this.onScrollHintClick=bind(this.onScrollHintClick,this),this.detectScrolledtoBottom=bind(this.detectScrolledtoBottom,this),this.onLeaveTemporary=bind(this.onLeaveTemporary,this),this.onAgentTypingEnd=bind(this.onAgentTypingEnd,this),this.onAgentTypingStart=bind(this.onAgentTypingStart,this),this.onQueue=bind(this.onQueue,this),this.onQueueScreen=bind(this.onQueueScreen,this),this.onWebSocketClose=bind(this.onWebSocketClose,this),this.onCloseAnimationEnd=bind(this.onCloseAnimationEnd,this),this.close=bind(this.close,this),this.toggle=bind(this.toggle,this),this.sessionClose=bind(this.sessionClose,this),this.onOpenAnimationEnd=bind(this.onOpenAnimationEnd,this),this.open=bind(this.open,this),this.renderMessage=bind(this.renderMessage,this),this.receiveMessage=bind(this.receiveMessage,this),this.onSubmit=bind(this.onSubmit,this),this.onFocus=bind(this.onFocus,this),this.onInput=bind(this.onInput,this),this.onReopenSession=bind(this.onReopenSession,this),this.onError=bind(this.onError,this),this.onWebSocketMessage=bind(this.onWebSocketMessage,this),this.send=bind(this.send,this),this.checkForEnter=bind(this.checkForEnter,this),this.render=bind(this.render,this),this.view=bind(this.view,this),this.T=bind(this.T,this),this.options=t.extend({},this.defaults,n),i.__super__.constructor.call(this,this.options),this.isFullscreen=e.matchMedia&&e.matchMedia("(max-width: 768px)").matches,this.scrollRoot=t(this.getScrollRoot()),t?e.WebSocket&&sessionStorage?this.options.chatId?(this.options.lang||(this.options.lang=t("html").attr("lang")),this.options.lang&&(this.translations[this.options.lang]||(this.log.debug("lang: No "+this.options.lang+" found, try first two letters"),this.options.lang=this.options.lang.replace(/-.+?$/,"")),this.log.debug("lang: "+this.options.lang)),this.options.host||this.detectHost(),this.loadCss(),this.io=new s(this.options),this.io.set({onOpen:this.render,onClose:this.onWebSocketClose,onMessage:this.onWebSocketMessage,onError:this.onError}),void this.io.connect()):(this.state="unsupported",void this.log.error("Chat: need chatId as option!")):(this.state="unsupported",void this.log.notice("Chat: Browser not supported!")):(this.state="unsupported",void this.log.notice("Chat: no jquery found!"))}return extend(i,n),i.prototype.defaults={chatId:void 0,show:!0,target:t("body"),host:"",debug:!1,flat:!1,lang:void 0,cssAutoload:!0,cssUrl:void 0,fontSize:void 0,buttonClass:"open-zammad-chat",inactiveClass:"is-inactive",title:"Chat with us!",scrollHint:"Scrolle nach unten um neue Nachrichten zu sehen",idleTimeout:6,idleTimeoutIntervallCheck:.5,inactiveTimeout:8,inactiveTimeoutIntervallCheck:.5,waitingListTimeout:4,waitingListTimeoutIntervallCheck:.5},i.prototype.logPrefix="chat",i.prototype._messageCount=0,i.prototype.isOpen=!1,i.prototype.blinkOnlineInterval=null,i.prototype.stopBlinOnlineStateTimeout=null,i.prototype.showTimeEveryXMinutes=2,i.prototype.lastTimestamp=null,i.prototype.lastAddedType=null,i.prototype.inputTimeout=null,i.prototype.isTyping=!1,i.prototype.state="offline",i.prototype.initialQueueDelay=1e4,i.prototype.translations={de:{"Chat with us!":"Chatte mit uns!","Scroll down to see new messages":"Scrolle nach unten um neue Nachrichten zu sehen",Online:"Online",Online:"Online",Offline:"Offline",Connecting:"Verbinden","Connection re-established":"Verbindung wiederhergestellt",Today:"Heute",Send:"Senden","Compose your message...":"Ihre Nachricht...","All colleagues are busy.":"Alle Kollegen sind belegt.","You are on waiting list position %s.":"Sie sind in der Warteliste an der Position %s.","Start new conversation":"Neue Konversation starten","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit %s geschlossen.","Since you didn't respond in the last %s minutes your conversation got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!"},fr:{"Chat with us!":"Chattez avec nous!","Scroll down to see new messages":"Faites défiler pour lire les nouveaux messages",Online:"En-ligne",Online:"En-ligne",Offline:"Hors-ligne",Connecting:"Connexion en cours","Connection re-established":"Connexion rétablie",Today:"Aujourdhui",Send:"Envoyer","Compose your message...":"Composez votre message...","All colleagues are busy.":"Tous les collègues sont actuellement occupés.","You are on waiting list position %s.":"Vous êtes actuellement en %s position dans la file d'attente.","Start new conversation":"Démarrer une nouvelle conversation","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation avec %s va être fermée.","Since you didn't respond in the last %s minutes your conversation got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation va être fermée.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Nous sommes désolés, il faut plus de temps que prévu pour obtenir un emplacement vide. Veuillez réessayer ultérieurement ou nous envoyer un courriel. Je vous remercie!"},"zh-cn":{"Chat with us!":"发起即时对话!","Scroll down to see new messages":"向下滚动以查看新消息",Online:"在线",Online:"在线",Offline:"离线",Connecting:"连接中","Connection re-established":"正在重新建立连接",Today:"今天",Send:"发送","Compose your message...":"正在输入信息...","All colleagues are busy.":"所有工作人员都在忙碌中.","You are on waiting list position %s.":"您目前的等候位置是第 %s 位.","Start new conversation":"开始新的会话","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由于您超过 %s 分钟没有回复, 您与 %s 的会话已被关闭.","Since you didn't respond in the last %s minutes your conversation got closed.":"由于您超过 %s 分钟没有任何回复, 该对话已被关闭.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 目前需要等候更长的时间才能接入对话, 请稍后重试或向我们发送电子邮件. 谢谢!"},"zh-tw":{"Chat with us!":"開始即時對话!","Scroll down to see new messages":"向下滑動以查看新訊息",Online:"線上",Online:"線上",Offline:"离线",Connecting:"連線中","Connection re-established":"正在重新建立連線中",Today:"今天",Send:"發送","Compose your message...":"正在輸入訊息...","All colleagues are busy.":"所有服務人員都在忙碌中.","You are on waiting list position %s.":"你目前的等候位置是第 %s 順位.","Start new conversation":"開始新的對話","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由於你超過 %s 分鐘沒有回應, 你與 %s 的對話已被關閉.","Since you didn't respond in the last %s minutes your conversation got closed.":"由於你超過 %s 分鐘沒有任何回應, 該對話已被關閉.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 當前需要等候更長的時間方可排入對話程序, 請稍後重試或向我們寄送電子郵件. 謝謝!"}},i.prototype.sessionId=void 0,i.prototype.scrolledToBottom=!0,i.prototype.scrollSnapTolerance=10,i.prototype.richTextFormatKey={66:!0,73:!0,85:!0,83:!0},i.prototype.T=function(){var t,e,n,s,i,o;if(i=arguments[0],e=2<=arguments.length?slice.call(arguments,1):[],this.options.lang&&"en"!==this.options.lang&&(this.translations[this.options.lang]?(o=this.translations[this.options.lang],o[i]||this.log.notice("Translation needed for '"+i+"'"),i=o[i]||i):this.log.notice("Translation '"+this.options.lang+"' needed!")),e)for(n=0,s=e.length;s>n;n++)t=e[n],i=i.replace(/%s/,t);return i},i.prototype.view=function(t){return function(n){return function(s){return s||(s={}),s.T=n.T,s.background=n.options.background,s.flat=n.options.flat,s.fontSize=n.options.fontSize,e.zammadChatTemplates[t](s)}}(this)},i.prototype.getScrollRoot=function(){var t,e,n;return"scrollingElement"in document?document.scrollingElement:(e=document.documentElement,n=e.scrollTop,e.scrollTop=n+1,t=e.scrollTop,e.scrollTop=n,t>n?e:document.body)},i.prototype.render=function(){return this.el&&t(".zammad-chat").get(0)||this.renderBase(),t("."+this.options.buttonClass).addClass(this.inactiveClass),this.setAgentOnlineState("online"),this.log.debug("widget rendered"),this.startTimeoutObservers(),this.idleTimeout.start(),this.sessionId=sessionStorage.getItem("sessionId"),this.send("chat_status_customer",{session_id:this.sessionId,url:e.location.href})},i.prototype.renderBase=function(){return this.el=t(this.view("chat")({title:this.options.title,scrollHint:this.options.scrollHint})),this.options.target.append(this.el),this.input=this.el.find(".zammad-chat-input"),this.el.find(".js-chat-open").click(this.open),this.el.find(".js-chat-toggle").click(this.toggle),this.el.find(".zammad-chat-controls").on("submit",this.onSubmit),this.el.find(".zammad-chat-body").on("scroll",this.detectScrolledtoBottom),this.el.find(".zammad-scroll-hint").click(this.onScrollHintClick),this.input.on({keydown:this.checkForEnter,input:this.onInput}),this.input.on("keydown",function(t){return function(e){var n;if(n=!1,e.altKey||e.ctrlKey||!e.metaKey?e.altKey||!e.ctrlKey||e.metaKey||(n=!0):n=!0,n&&t.richTextFormatKey[e.keyCode]){if(e.preventDefault(),66===e.keyCode)return document.execCommand("bold"),!0;if(73===e.keyCode)return document.execCommand("italic"),!0;if(85===e.keyCode)return document.execCommand("underline"),!0;if(83===e.keyCode)return document.execCommand("strikeThrough"),!0}}}(this)),this.input.on("paste",function(n){return function(s){var i,o,a,r,l,h,d,c,u,p,m,g,f;if(s.stopPropagation(),s.preventDefault(),s.clipboardData)i=s.clipboardData;else if(e.clipboardData)i=e.clipboardData;else{if(!s.originalEvent.clipboardData)throw"No clipboardData support";i=s.originalEvent.clipboardData}if(d=!1,i&&i.items&&i.items[0]&&(c=i.items[0],"file"!==c.kind||"image/png"!==c.type&&"image/jpeg"!==c.type||(h=c.getAsFile(),p=new FileReader,p.onload=function(t){var e,s,i;return i=t.target.result,e=document.createElement("img"),e.src=i,s=function(t,s,o,a){return n.isRetina()&&(s/=2,o/=2),i=t,e='',document.execCommand("insertHTML",!1,e)},n.resizeImage(e.src,460,"auto",2,"image/jpeg","auto",s)},p.readAsDataURL(h),d=!0)),!d){f=void 0,o=void 0;try{f=i.getData("text/html"),o="html",f&&0!==f.length||(o="text",f=i.getData("text/plain")),f&&0!==f.length||(o="text2",f=i.getData("text"))}catch(a){s=a,console.log("Sorry, can't insert markup because browser is not supporting it."),o="text3",f=i.getData("text")}return("text"===o||"text2"===o||"text3"===o)&&(f="
                  "+f.replace(/\n/g,"
                  ")+"
                  ",f=f.replace(/
                  <\/div>/g,"

                  ")),console.log("p",o,f),"html"===o&&(r=t("
                  "+f+"
                  "),u=!1,l=f,m=new RegExp("<(/w|w):[A-Za-z]"),l.match(m)&&(u=!0,l=l.replace(m,"")),m=new RegExp("<(/o|o):[A-Za-z]"),l.match(m)&&(u=!0,l=l.replace(m,"")),u&&(r=n.wordFilter(r)),r=t(r),r.contents().each(function(){return 8===this.nodeType?t(this).remove():void 0}),r.find("a, font, small, time, form, label").replaceWith(function(){return t(this).contents()}),g="div",r.find("textarea").each(function(){var e,n;return n=this.outerHTML,m=new RegExp("<"+this.tagName,"i"),e=n.replace(m,"<"+g),m=new RegExp("'),s=s.get(0),document.caretPositionFromPoint?(d=document.caretPositionFromPoint(r,l),c=document.createRange(),c.setStart(d.offsetNode,d.offset),c.collapse(),c.insertNode(s)):document.caretRangeFromPoint?(c=document.caretRangeFromPoint(r,l),c.insertNode(s)):console.log("could not find carat")},n.resizeImage(s.src,460,"auto",2,"image/jpeg","auto",i)},a.readAsDataURL(o)):void 0}}(this)),t(e).on("beforeunload",function(t){return function(){return t.onLeaveTemporary()}}(this)),t(e).bind("hashchange",function(t){return function(){return t.isOpen?void(t.sessionId&&t.send("chat_session_notice",{session_id:t.sessionId,message:e.location.href})):t.idleTimeout.start()}}(this)),this.isFullscreen?this.input.on({focus:this.onFocus,focusout:this.onFocusOut}):void 0},i.prototype.checkForEnter=function(t){return t.shiftKey||13!==t.keyCode?void 0:(t.preventDefault(),this.sendMessage())},i.prototype.send=function(t,e){return null==e&&(e={}),e.chat_id=this.options.chatId,this.io.send(t,e)},i.prototype.onWebSocketMessage=function(t){var e,n,s;for(e=0,n=t.length;n>e;e++)switch(s=t[e],this.log.debug("ws:onmessage",s),s.event){case"chat_error":this.log.notice(s.data),s.data&&"chat_disabled"===s.data.state&&this.destroy({remove:!0});break;case"chat_session_message":if(s.data.self_written)return;this.receiveMessage(s.data);break;case"chat_session_typing":if(s.data.self_written)return;this.onAgentTypingStart();break;case"chat_session_start":this.onConnectionEstablished(s.data);break;case"chat_session_queue":this.onQueueScreen(s.data);break;case"chat_session_closed":this.onSessionClosed(s.data);break;case"chat_session_left":this.onSessionClosed(s.data);break;case"chat_status_customer":switch(s.data.state){case"online":this.sessionId=void 0,!this.options.cssAutoload||this.cssLoaded?this.onReady():this.socketReady=!0;break;case"offline":this.onError("Zammad Chat: No agent online");break;case"chat_disabled":this.onError("Zammad Chat: Chat is disabled");break;case"no_seats_available":this.onError("Zammad Chat: Too many clients in queue. Clients in queue: "+s.data.queue);break;case"reconnect":this.onReopenSession(s.data)}}},i.prototype.onReady=function(){return this.log.debug("widget ready for use"),t("."+this.options.buttonClass).click(this.open).removeClass(this.inactiveClass),this.options.show?this.show():void 0},i.prototype.onError=function(e){return this.log.debug(e),this.addStatus(e),t("."+this.options.buttonClass).hide(),this.isOpen?(this.disableInput(),this.destroy({remove:!1})):this.destroy({remove:!0})},i.prototype.onReopenSession=function(t){var e,n,s,i,o;if(this.log.debug("old messages",t.session),this.inactiveTimeout.start(),o=sessionStorage.getItem("unfinished_message"),t.agent){for(this.onConnectionEstablished(t),i=t.session,e=0,n=i.length;n>e;e++)s=i[e],this.renderMessage({message:s.content,id:s.id,from:s.created_by_id?"agent":"customer"});o&&this.input.html(o)}return t.position&&this.onQueue(t),this.show(),this.open(),this.scrollToBottom(),o?this.input.focus():void 0},i.prototype.onInput=function(){return this.el.find(".zammad-chat-message--unread").removeClass("zammad-chat-message--unread"),sessionStorage.setItem("unfinished_message",this.input.html()),this.onTyping()},i.prototype.onFocus=function(){var n;return t(e).scrollTop(10),n=t(e).scrollTop()>0,t(e).scrollTop(0),n?this.log.notice("virtual keyboard shown"):void 0},i.prototype.onFocusOut=function(){},i.prototype.onTyping=function(){return this.isTyping&&this.isTyping>new Date((new Date).getTime()-1500)?void 0:(this.isTyping=new Date,this.send("chat_session_typing",{session_id:this.sessionId}),this.inactiveTimeout.start())},i.prototype.onSubmit=function(t){return t.preventDefault(),this.sendMessage()},i.prototype.sendMessage=function(){var t,e;return(t=this.input.html())?(this.inactiveTimeout.start(),sessionStorage.removeItem("unfinished_message"),e=this.view("message")({message:t,from:"customer",id:this._messageCount++,unreadClass:""}),this.maybeAddTimestamp(),this.el.find(".zammad-chat-message--typing").get(0)?(this.lastAddedType="typing-placeholder",this.el.find(".zammad-chat-message--typing").before(e)):(this.lastAddedType="message--customer",this.el.find(".zammad-chat-body").append(e)),this.input.html(""),this.scrollToBottom(),this.send("chat_session_message",{content:t,id:this._messageCount,session_id:this.sessionId})):void 0},i.prototype.receiveMessage=function(t){return this.inactiveTimeout.start(),this.onAgentTypingEnd(),this.maybeAddTimestamp(),this.renderMessage({message:t.message.content,id:t.id,from:"agent"}),this.scrollToBottom({showHint:!0})},i.prototype.renderMessage=function(t){return this.lastAddedType="message--"+t.from,t.unreadClass=document.hidden?" zammad-chat-message--unread":"",this.el.find(".zammad-chat-body").append(this.view("message")(t))},i.prototype.open=function(){var t;return this.isOpen?void this.log.debug("widget already open, block"):(this.isOpen=!0,this.log.debug("open widget"),this.sessionId||this.showLoader(),this.el.addClass("zammad-chat-is-open"),t=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.css("bottom",-t),this.sessionId?(this.el.css("bottom",0),this.onOpenAnimationEnd()):(this.el.animate({bottom:0},500,this.onOpenAnimationEnd),this.send("chat_session_init",{url:e.location.href})))},i.prototype.onOpenAnimationEnd=function(){return this.idleTimeout.stop(),this.isFullscreen?this.disableScrollOnRoot():void 0},i.prototype.sessionClose=function(){return this.send("chat_session_close",{session_id:this.sessionId}),this.inactiveTimeout.stop(),this.waitingListTimeout.stop(),sessionStorage.removeItem("unfinished_message"),this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.setSessionId(void 0)},i.prototype.toggle=function(t){return this.isOpen?this.close(t):this.open(t)},i.prototype.close=function(t){var e;return this.isOpen?(this.initDelayId&&clearTimeout(this.initDelayId),this.sessionId?(this.log.debug("close widget"),t&&t.stopPropagation(),this.sessionClose(),this.isFullscreen&&this.enableScrollOnRoot(),e=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.animate({bottom:-e},500,this.onCloseAnimationEnd)):void this.log.debug("can't close widget without sessionId")):void this.log.debug("can't close widget, it's not open")},i.prototype.onCloseAnimationEnd=function(){return this.el.css("bottom",""),this.el.removeClass("zammad-chat-is-open"),this.showLoader(),this.el.find(".zammad-chat-welcome").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").addClass("zammad-chat-is-hidden"),this.isOpen=!1,this.io.reconnect()},i.prototype.onWebSocketClose=function(){return this.isOpen?void 0:this.el?(this.el.removeClass("zammad-chat-is-shown"),this.el.removeClass("zammad-chat-is-loaded")):void 0},i.prototype.show=function(){return"offline"!==this.state?(this.el.addClass("zammad-chat-is-loaded"),this.el.addClass("zammad-chat-is-shown")):void 0},i.prototype.disableInput=function(){return this.input.prop("disabled",!0),this.el.find(".zammad-chat-send").prop("disabled",!0)},i.prototype.enableInput=function(){return this.input.prop("disabled",!1),this.el.find(".zammad-chat-send").prop("disabled",!1)},i.prototype.hideModal=function(){return this.el.find(".zammad-chat-modal").html("")},i.prototype.onQueueScreen=function(t){var e;return this.setSessionId(t.session_id),e=function(e){return function(){return e.onQueue(t),e.waitingListTimeout.start()}}(this),this.initialQueueDelay&&!this.onInitialQueueDelayId?void(this.onInitialQueueDelayId=setTimeout(e,this.initialQueueDelay)):(this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),e())},i.prototype.onQueue=function(t){return this.log.notice("onQueue",t.position),this.inQueue=!0,this.el.find(".zammad-chat-modal").html(this.view("waiting")({position:t.position}))},i.prototype.onAgentTypingStart=function(){return this.stopTypingId&&clearTimeout(this.stopTypingId),this.stopTypingId=setTimeout(this.onAgentTypingEnd,3e3),!this.el.find(".zammad-chat-message--typing").get(0)&&(this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("typingIndicator")()),this.isVisible(this.el.find(".zammad-chat-message--typing"),!0))?this.scrollToBottom():void 0},i.prototype.onAgentTypingEnd=function(){return this.el.find(".zammad-chat-message--typing").remove()},i.prototype.onLeaveTemporary=function(){return this.sessionId?this.send("chat_session_leave_temporary",{session_id:this.sessionId}):void 0},i.prototype.maybeAddTimestamp=function(){var t,e,n;return n=Date.now(),!this.lastTimestamp||n-this.lastTimestamp>6e4*this.showTimeEveryXMinutes?(t=this.T("Today"),e=(new Date).toTimeString().substr(0,5),"timestamp"===this.lastAddedType?(this.updateLastTimestamp(t,e),this.lastTimestamp=n):(this.el.find(".zammad-chat-body").append(this.view("timestamp")({label:t,time:e})),this.lastTimestamp=n,this.lastAddedType="timestamp",this.scrollToBottom())):void 0},i.prototype.updateLastTimestamp=function(t,e){return this.el?this.el.find(".zammad-chat-body").find(".zammad-chat-timestamp").last().replaceWith(this.view("timestamp")({label:t,time:e})):void 0},i.prototype.addStatus=function(t){return this.el?(this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("status")({status:t})),this.scrollToBottom()):void 0},i.prototype.detectScrolledtoBottom=function(){var t;return t=this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-chat-body").outerHeight(),this.scrolledToBottom=Math.abs(t-this.el.find(".zammad-chat-body").prop("scrollHeight"))<=this.scrollSnapTolerance,this.scrolledToBottom?this.el.find(".zammad-scroll-hint").addClass("is-hidden"):void 0},i.prototype.showScrollHint=function(){return this.el.find(".zammad-scroll-hint").removeClass("is-hidden"),this.el.find(".zammad-chat-body").scrollTop(this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-scroll-hint").outerHeight())},i.prototype.onScrollHintClick=function(){return this.el.find(".zammad-chat-body").animate({scrollTop:this.el.find(".zammad-chat-body").prop("scrollHeight")},300)},i.prototype.scrollToBottom=function(e){var n;return n=(null!=e?e:{showHint:!1}).showHint,this.scrolledToBottom?this.el.find(".zammad-chat-body").scrollTop(t(".zammad-chat-body").prop("scrollHeight")):n?this.showScrollHint():void 0},i.prototype.destroy=function(t){return null==t&&(t={}),this.log.debug("destroy widget",t),this.setAgentOnlineState("offline"),t.remove&&this.el&&this.el.remove(),this.waitingListTimeout&&this.waitingListTimeout.stop(),this.inactiveTimeout&&this.inactiveTimeout.stop(),this.idleTimeout&&this.idleTimeout.stop(),this.io.close()},i.prototype.reconnect=function(){return this.log.notice("reconnecting"),this.disableInput(),this.lastAddedType="status",this.setAgentOnlineState("connecting"),this.addStatus(this.T("Connection lost"))},i.prototype.onConnectionReestablished=function(){return this.lastAddedType="status",this.setAgentOnlineState("online"),this.addStatus(this.T("Connection re-established"))},i.prototype.onSessionClosed=function(t){return this.addStatus(this.T("Chat closed by %s",t.realname)),this.disableInput(),this.setAgentOnlineState("offline"),this.inactiveTimeout.stop()},i.prototype.setSessionId=function(t){return this.sessionId=t,void 0===t?sessionStorage.removeItem("sessionId"):sessionStorage.setItem("sessionId",t)},i.prototype.onConnectionEstablished=function(t){return this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.inQueue=!1,t.agent&&(this.agent=t.agent),t.session_id&&this.setSessionId(t.session_id),this.el.find(".zammad-chat-body").html(""),this.el.find(".zammad-chat-agent").html(this.view("agent")({agent:this.agent})),this.enableInput(),this.hideModal(),this.el.find(".zammad-chat-welcome").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").removeClass("zammad-chat-is-hidden"),this.isFullscreen||this.input.focus(),this.setAgentOnlineState("online"),this.waitingListTimeout.stop(),this.idleTimeout.stop(),this.inactiveTimeout.start()},i.prototype.showCustomerTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("customer_timeout")({agent:this.agent.name,delay:this.options.inactiveTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},i.prototype.showWaitingListTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("waiting_list_timeout")({delay:this.options.watingListTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},i.prototype.showLoader=function(){return this.el.find(".zammad-chat-modal").html(this.view("loader")())},i.prototype.setAgentOnlineState=function(t){var e;return this.state=t,this.el?(e=t.charAt(0).toUpperCase()+t.slice(1),this.el.find(".zammad-chat-agent-status").attr("data-status",t).text(this.T(e))):void 0},i.prototype.detectHost=function(){var t;return t="ws://","https"===h&&(t="wss://"),this.options.host=""+t+l+"/ws"},i.prototype.loadCss=function(){var t,e,n;if(this.options.cssAutoload)return n=this.options.cssUrl,n||(n=this.options.host.replace(/^wss/i,"https").replace(/^ws/i,"http").replace(/\/ws/i,""),n+="/assets/chat/chat.css"),this.log.debug("load css from '"+n+"'"),e="@import url('"+n+"');",t=document.createElement("link"),t.onload=this.onCssLoaded,t.rel="stylesheet",t.href="data:text/css,"+escape(e),document.getElementsByTagName("head")[0].appendChild(t); +},i.prototype.onCssLoaded=function(){return this.socketReady?this.onReady():this.cssLoaded=!0},i.prototype.startTimeoutObservers=function(){return this.idleTimeout=new o({logPrefix:"idleTimeout",debug:this.options.debug,timeout:this.options.idleTimeout,timeoutIntervallCheck:this.options.idleTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Idle timeout reached, hide widget",new Date),t.destroy({remove:!0})}}(this)}),this.inactiveTimeout=new o({logPrefix:"inactiveTimeout",debug:this.options.debug,timeout:this.options.inactiveTimeout,timeoutIntervallCheck:this.options.inactiveTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Inactive timeout reached, show timeout screen.",new Date),t.showCustomerTimeout(),t.destroy({remove:!1})}}(this)}),this.waitingListTimeout=new o({logPrefix:"waitingListTimeout",debug:this.options.debug,timeout:this.options.waitingListTimeout,timeoutIntervallCheck:this.options.waitingListTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Waiting list timeout reached, show timeout screen.",new Date),t.showWaitingListTimeout(),t.destroy({remove:!1})}}(this)})},i.prototype.disableScrollOnRoot=function(){return this.rootScrollOffset=this.scrollRoot.scrollTop(),this.scrollRoot.css({overflow:"hidden",position:"fixed"})},i.prototype.enableScrollOnRoot=function(){return this.scrollRoot.scrollTop(this.rootScrollOffset),this.scrollRoot.css({overflow:"",position:""})},i.prototype.isVisible=function(n,s,i,o){var a,r,l,h,d,c,u,p,m,g,f,v,y,b,w,T,C,z,S,k,I,A,_,x,E,O;if(!(n.length<1))if(r=t(e),a=n.length>1?n.eq(0):n,z=a.get(0),O=r.width(),E=r.height(),o=o?o:"both",p=i===!0?z.offsetWidth*z.offsetHeight:!0,"function"==typeof z.getBoundingClientRect){if(C=z.getBoundingClientRect(),S=C.top>=0&&C.top0&&C.bottom<=E,b=C.left>=0&&C.left0&&C.right<=O,k=s?S||u:S&&u,y=s?b||T:b&&T,"both"===o)return p&&k&&y;if("vertical"===o)return p&&k;if("horizontal"===o)return p&&y}else{if(x=r.scrollTop(),I=x+E,A=r.scrollLeft(),_=A+O,w=a.offset(),c=w.top,l=c+a.height(),h=w.left,d=h+a.width(),v=s===!0?l:c,m=s===!0?c:l,g=s===!0?d:h,f=s===!0?h:d,"both"===o)return!!p&&I>=m&&v>=x&&_>=f&&g>=A;if("vertical"===o)return!!p&&I>=m&&v>=x;if("horizontal"===o)return!!p&&_>=f&&g>=A}},i.prototype.isRetina=function(){var t;return e.matchMedia?(t=e.matchMedia("only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)"),t&&t.matches||e.devicePixelRatio>1):!1},i.prototype.resizeImage=function(t,e,n,s,i,o,a,r){var l;return null==e&&(e="auto"),null==n&&(n="auto"),null==s&&(s=1),null==r&&(r=!0),l=new Image,l.onload=function(){var t,r,h,d,c,u,p;return c=l.width,d=l.height,console.log("ImageService","current size",c,d),"auto"===n&&"auto"===e&&(e=c,n=d),"auto"===n&&(h=c/e,n=d/h),"auto"===e&&(h=c/n,e=d/h),p=!1,c>e||d>n?(p=!0,e*=s,n*=s):(e=c,n=d),t=document.createElement("canvas"),t.width=e,t.height=n,r=t.getContext("2d"),r.drawImage(l,0,0,e,n),"auto"===o&&(o=200>e&&200>n?1:400>e&&400>n?.9:600>e&&600>n?.8:900>e&&900>n?.7:.6),u=t.toDataURL(i,o),p?(console.log("ImageService","resize",e/s,n/s,o,.75*u.length/1024/1024,"in mb"),void a(u,e/s,n/s,!0)):(console.log("ImageService","no resize",e,n,o,.75*u.length/1024/1024,"in mb"),a(u,e,n,!1))},l.src=t},i.prototype.pasteHtmlAtCaret=function(t){var n,s,i,o,a,r;if(r=void 0,a=void 0,e.getSelection){if(r=e.getSelection(),r.getRangeAt&&r.rangeCount){for(a=r.getRangeAt(0),a.deleteContents(),n=document.createElement("div"),n.innerHTML=t,s=document.createDocumentFragment(o,i);o=n.firstChild;)i=s.appendChild(o);if(a.insertNode(s),i)return a=a.cloneRange(),a.setStartAfter(i),a.collapse(!0),r.removeAllRanges(),r.addRange(a)}}else if(document.selection&&"Control"!==document.selection.type)return document.selection.createRange().pasteHTML(t)},i.prototype.wordFilter=function(e){var n,s,i;return n=e.html(),n=n.replace(//gi,""),n=n.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,""),n=n.replace(/<(\/?)s>/gi,"<$1strike>"),n=n.replace(/ /gi," "),e.html(n),t("p",e).each(function(){var e,n;return n=t(this).attr("style"),e=/mso-list:\w+ \w+([0-9]+)/.exec(n),e?t(this).data("_listLevel",parseInt(e[1],10)):void 0}),s=0,i=null,t("p",e).each(function(){var e,n,o,a,r,l,h,d,c,u;if(e=t(this).data("_listLevel"),void 0!==e){if(u=t(this).text(),a="
                    ",/^\s*\w+\./.test(u)&&(r=/([0-9])\./.exec(u),r?(c=parseInt(r[1],10),a=null!=(l=c>1)?l:'
                      ':"
                        "}):a="
                          "),e>s&&(0===s?(t(this).before(a),i=t(this).prev()):i=t(a).appendTo(i)),s>e)for(n=o=h=n,d=s-e;d>=h?d>=o:o>=d;n=d>=h?++o:--o)i=i.parent();return t("span:first",this).remove(),i.append("
                        1. "+t(this).html()+"
                          2. "),t(this).remove(),s=e}return s=0}),t("[style]",e).removeAttr("style"),t("[align]",e).removeAttr("align"),t("span",e).replaceWith(function(){return t(this).contents()}),t("span:empty",e).remove(),t("[class^='Mso']",e).removeAttr("class"),t("p:empty",e).remove(),e},i.prototype.removeAttribute=function(e){var n,s,i,o,a;if(e){for(n=t(e),a=e.attributes,i=0,o=a.length;o>i;i++)s=a[i],s&&s.name&&e.removeAttribute(s.name);return n.removeAttr("style").removeAttr("class").removeAttr("lang").removeAttr("type").removeAttr("align").removeAttr("id").removeAttr("wrap").removeAttr("title")}},i.prototype.removeAttributes=function(t,e){return null==e&&(e=!0),e&&t.each(function(t){return function(e,n){return t.removeAttribute(n)}}(this)),t.find("*").each(function(t){return function(e,n){return t.removeAttribute(n)}}(this)),t},i}(n),e.ZammadChat=a}(window.jQuery,window),window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.chat=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n
                          \n
                          \n \n \n \n \n \n
                          \n
                          \n
                          \n
                          \n \n '),n.push(this.T(this.title)),n.push('\n
                          \n
                          \n
                          \n \n
                          \n
                          \n
                          \n \n
                          \n
                          ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n '),this.agent?(n.push("\n "),n.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),n.push("\n ")):(n.push("\n "),n.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),n.push("\n ")),n.push('\n
                          \n
                          "),n.push(this.T("Start new conversation")),n.push("
                          \n
                          ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('\n \n \n \n\n'),n.push(this.T("Connecting")),n.push("")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n "),n.push(this.message),n.push("\n
                          ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n
                          \n '),n.push(this.status),n.push("\n
                          \n
                          ")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          '),n.push(s(this.label)),n.push(" "),n.push(s(this.time)),n.push("
                          ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n \n \n \n \n \n \n \n
                          ')}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e,n=[],s=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n \n \n \n \n \n '),n.push(this.T("All colleagues are busy.")),n.push("
                          \n "),n.push(this.T("You are on waiting list position %s.",this.position)),n.push("\n
                          ")}).call(this)}.call(t),t.safe=s,t.escape=i,n.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e,n=[],s=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){n.push('
                          \n '),n.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),n.push('\n
                          \n
                          "),n.push(this.T("Start new conversation")),n.push("
                          \n
                          ")}).call(this)}.call(t),t.safe=i,t.escape=o,n.join("")}; \ No newline at end of file diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss index 1cec7cef1..579ebce53 100644 --- a/public/assets/chat/chat.scss +++ b/public/assets/chat/chat.scss @@ -329,7 +329,7 @@ .zammad-chat-controls { overflow: hidden; display: none; - align-items: flex-start; + align-items: flex-end; border-top: 1px solid hsl(0,0%,93%); padding: 0; margin: 0; @@ -349,21 +349,19 @@ margin: 0; padding: 1em 2em; float: left; - width: auto; - height: auto; max-height: 6em; - min-height: 1.4em !important; + min-height: 1.4em; font-family: inherit; line-height: 1.4em; font-size: inherit; appearance: none; - border: none !important; + border: none; background: none; - box-shadow: none !important; + box-shadow: none ; box-sizing: content-box; outline: none; - resize: none; flex: 1; + overflow: auto; } .zammad-chat-input::-webkit-input-placeholder { @@ -378,7 +376,7 @@ background: hsl(203,67%,53%); color: white; padding: 0.5em 1.2em; - margin: 0.5em 1em 0.5em; + margin: 0.63em 1em; cursor: pointer; border: none; border-radius: 1.5em; diff --git a/public/assets/chat/gulpfile.js b/public/assets/chat/gulpfile.js index 60372ab40..b73b6e9ea 100644 --- a/public/assets/chat/gulpfile.js +++ b/public/assets/chat/gulpfile.js @@ -29,9 +29,7 @@ gulp.task('js', function(){ .pipe(plumber()) .pipe(coffee({bare: true}).on('error', gutil.log)); - var autoGrow = gulp.src('jquery.autoGrow.js'); - - return merge(templates, js, autoGrow) + return merge(templates, js) .pipe(concat('chat.js')) .pipe(gulp.dest('./')) .pipe(uglify()) diff --git a/public/assets/chat/jquery.autoGrow.js b/public/assets/chat/jquery.autoGrow.js deleted file mode 100644 index cda824c42..000000000 --- a/public/assets/chat/jquery.autoGrow.js +++ /dev/null @@ -1,92 +0,0 @@ -/*! - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Jevin O. Sewaruth - * ---------------------------------------------------------------------------- - * - * Autogrow Textarea Plugin Version v3.0 - * http://www.technoreply.com/autogrow-textarea-plugin-3-0 - * - * THIS PLUGIN IS DELIVERD ON A PAY WHAT YOU WHANT BASIS. IF THE PLUGIN WAS USEFUL TO YOU, PLEASE CONSIDER BUYING THE PLUGIN HERE : - * https://sites.fastspring.com/technoreply/instant/autogrowtextareaplugin - * - * Date: October 15, 2012 - * - * Zammad modification: - * - remove overflow:hidden when maximum height is reached - * - mirror box-sizing - * - */ - -jQuery.fn.autoGrow = function(options) { - return this.each(function() { - var settings = jQuery.extend({ - extraLine: true, - }, options); - - var createMirror = function(textarea) { - jQuery(textarea).after('
                          '); - return jQuery(textarea).next('.autogrow-textarea-mirror')[0]; - } - - var sendContentToMirror = function (textarea) { - mirror.innerHTML = String(textarea.value) - .replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, ''') - .replace(//g, '>') - .replace(/ /g, ' ') - .replace(/\n/g, '
                          ') + - (settings.extraLine? '.
                          .' : '') - ; - - if (jQuery(textarea).height() != jQuery(mirror).height()) { - jQuery(textarea).height(jQuery(mirror).height()); - - var overflow = jQuery(mirror).height() > maxHeight ? '' : 'hidden'; - jQuery(textarea).css('overflow', overflow); - } - } - - var growTextarea = function () { - sendContentToMirror(this); - } - - // Create a mirror - var mirror = createMirror(this); - - // Store max-height - var maxHeight = parseInt(jQuery(this).css('max-height'), 10); - - // Style the mirror - mirror.style.display = 'none'; - mirror.style.wordWrap = 'break-word'; - mirror.style.whiteSpace = 'normal'; - mirror.style.padding = jQuery(this).css('paddingTop') + ' ' + - jQuery(this).css('paddingRight') + ' ' + - jQuery(this).css('paddingBottom') + ' ' + - jQuery(this).css('paddingLeft'); - - mirror.style.width = jQuery(this).css('width'); - mirror.style.fontFamily = jQuery(this).css('font-family'); - mirror.style.fontSize = jQuery(this).css('font-size'); - mirror.style.lineHeight = jQuery(this).css('line-height'); - mirror.style.letterSpacing = jQuery(this).css('letter-spacing'); - mirror.style.boxSizing = jQuery(this).css('boxSizing'); - - // Style the textarea - this.style.overflow = "hidden"; - this.style.minHeight = this.rows+"em"; - - // Bind the textarea's event - this.onkeyup = growTextarea; - this.onfocus = growTextarea; - - // Fire the event for text already present - sendContentToMirror(this); - - }); -}; \ No newline at end of file diff --git a/public/assets/chat/views/chat.eco b/public/assets/chat/views/chat.eco index 6d73cc626..2860d193e 100644 --- a/public/assets/chat/views/chat.eco +++ b/public/assets/chat/views/chat.eco @@ -21,7 +21,7 @@
                          - +
                          \ No newline at end of file diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 5a377c4a6..b4b8b1d0e 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckbox-indeterminatecheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddraggabledropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookformgithub-buttongitlab-buttongoogle-buttongrouphelpimportantin-processinfoline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-superbadmood-supergoodmutenoteoauth2-buttonone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusprinterradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsearchdetailsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtelegramtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserwebzoom-inzoom-out \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckbox-indeterminatecheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddraggabledropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookformgithub-buttongitlab-buttongoogle-buttongrouphelpimportantin-processinfoline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-superbadmood-supergoodmutenoteoauth2-buttonoffice365-buttonone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusprinterradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsearchdetailsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtelegramtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserwebzoom-inzoom-out \ No newline at end of file diff --git a/public/assets/images/icons/office365-button.svg b/public/assets/images/icons/office365-button.svg new file mode 100644 index 000000000..8fe7b1fda --- /dev/null +++ b/public/assets/images/icons/office365-button.svg @@ -0,0 +1,12 @@ + + + + office365-button + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/test/controllers/user_organization_controller_test.rb b/test/controllers/user_organization_controller_test.rb index 1107547ce..4754a75de 100644 --- a/test/controllers/user_organization_controller_test.rb +++ b/test/controllers/user_organization_controller_test.rb @@ -126,7 +126,23 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest assert_response(422) result = JSON.parse(@response.body) assert(result['error']) - assert_equal('User already exists!', result['error']) + assert_equal('Email address is already used for other user.', result['error']) + + # email missing with enabled feature + params = { firstname: 'some firstname', signup: true } + post '/api/v1/users', params.to_json, headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Attribute \'email\' required!', result['error']) + + # email missing with enabled feature + params = { firstname: 'some firstname', signup: true } + post '/api/v1/users', params.to_json, headers + assert_response(422) + result = JSON.parse(@response.body) + assert(result['error']) + assert_equal('Attribute \'email\' required!', result['error']) # create user with enabled feature (take customer role) params = { firstname: 'Me First', lastname: 'Me Last', email: 'new_here@example.com', signup: true } @@ -322,7 +338,7 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest assert_response(422) result = JSON.parse(@response.body) assert(result) - assert_equal('User already exists!', result['error']) + assert_equal('Email address is already used for other user.', result['error']) # missing required attributes params = { note: 'some note' } @@ -330,15 +346,9 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest assert_response(422) result = JSON.parse(@response.body) assert(result) - assert_equal('Attribute \'login\' required!', result['error']) - - params = { firstname: 'newfirstname123', note: 'some note' } - post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials) - assert_response(422) - result = JSON.parse(@response.body) - assert(result) - assert_equal('Attribute \'login\' required!', result['error']) + assert_equal('Minimum one identifier (login, firstname, lastname, phone or email) for user is required.', result['error']) + # invalid email params = { firstname: 'newfirstname123', email: 'some_what', note: 'some note' } post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials) assert_response(422) @@ -346,6 +356,20 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest assert(result) assert_equal('Invalid email', result['error']) + # with valid attributes + params = { firstname: 'newfirstname123', note: 'some note' } + post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials) + assert_response(201) + result = JSON.parse(@response.body) + assert(result) + user = User.find(result['id']) + assert_not(user.role?('Admin')) + assert_not(user.role?('Agent')) + assert(user.role?('Customer')) + assert(result['login'].start_with?('auto-')) + assert_equal('', result['email']) + assert_equal('newfirstname123', result['firstname']) + assert_equal('', result['lastname']) end test 'user index and create with agent' do diff --git a/test/integration/email_deliver_test.rb b/test/integration/email_deliver_test.rb index 6d13296b6..440dc550b 100644 --- a/test/integration/email_deliver_test.rb +++ b/test/integration/email_deliver_test.rb @@ -4,16 +4,16 @@ require 'test_helper' class EmailDeliverTest < ActiveSupport::TestCase test 'basic check' do - if !ENV['MAIL_SERVER'] + if ENV['MAIL_SERVER'].blank? raise "Need MAIL_SERVER as ENV variable like export MAIL_SERVER='mx.example.com'" end - if !ENV['MAIL_SERVER_ACCOUNT'] + if ENV['MAIL_SERVER_ACCOUNT'].blank? raise "Need MAIL_SERVER_ACCOUNT as ENV variable like export MAIL_SERVER_ACCOUNT='user:somepass'" end server_login = ENV['MAIL_SERVER_ACCOUNT'].split(':')[0] server_password = ENV['MAIL_SERVER_ACCOUNT'].split(':')[1] - email_address = EmailAddress.create( + email_address = EmailAddress.create!( realname: 'me Helpdesk', email: "me#{rand(999_999_999)}@example.com", updated_by_id: 1, @@ -27,7 +27,7 @@ class EmailDeliverTest < ActiveSupport::TestCase created_by_id: 1, ) - channel = Channel.create( + channel = Channel.create!( area: 'Email::Account', group_id: group.id, options: { @@ -50,9 +50,9 @@ class EmailDeliverTest < ActiveSupport::TestCase ) email_address.channel_id = channel.id - email_address.save + email_address.save! - ticket1 = Ticket.create( + ticket1 = Ticket.create!( title: 'some delivery test', group: group, customer_id: 2, @@ -63,7 +63,7 @@ class EmailDeliverTest < ActiveSupport::TestCase ) assert(ticket1, 'ticket created') - article1 = Ticket::Article.create( + article1 = Ticket::Article.create!( ticket_id: ticket1.id, to: 'some_recipient@example_not_existing_what_ever.com', subject: 'some subject', @@ -189,7 +189,7 @@ class EmailDeliverTest < ActiveSupport::TestCase # remove background jobs Delayed::Job.destroy_all - article2 = Ticket::Article.create( + article2 = Ticket::Article.create!( ticket_id: ticket1.id, to: 'some_recipient@example_not_existing_what_ever.com', subject: 'some subject2', diff --git a/test/integration/email_keep_on_server_test.rb b/test/integration/email_keep_on_server_test.rb new file mode 100644 index 000000000..99d8069b9 --- /dev/null +++ b/test/integration/email_keep_on_server_test.rb @@ -0,0 +1,232 @@ +# encoding: utf-8 +require 'test_helper' +require 'net/imap' + +class EmailKeepOnServerTest < ActiveSupport::TestCase + setup do + + if ENV['KEEP_ON_MAIL_SERVER'].blank? + raise "Need KEEP_ON_MAIL_SERVER as ENV variable like export KEEP_ON_MAIL_SERVER='mx.example.com'" + end + if ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].blank? + raise "Need KEEP_ON_MAIL_SERVER_ACCOUNT as ENV variable like export KEEP_ON_MAIL_SERVER_ACCOUNT='user:somepass'" + end + @server_login = ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].split(':')[0] + @server_password = ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].split(':')[1] + + @folder = "keep_on_mail_server_#{rand(999_999_999)}" + + email_address = EmailAddress.create!( + realname: 'me Helpdesk', + email: "me#{rand(999_999_999)}@example.com", + updated_by_id: 1, + created_by_id: 1, + ) + + group = Group.create_or_update( + name: 'KeepOnServerTest', + email_address_id: email_address.id, + updated_by_id: 1, + created_by_id: 1, + ) + + @channel = Channel.create!( + area: 'Email::Account', + group_id: group.id, + options: { + inbound: { + adapter: 'imap', + options: { + host: ENV['KEEP_ON_MAIL_SERVER'], + user: @server_login, + password: @server_password, + ssl: true, + folder: @folder, + #keep_on_server: true, + } + }, + outbound: { + adapter: 'sendmail' + } + }, + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + email_address.channel_id = @channel.id + email_address.save! + + end + + test 'keep on server' do + @channel.options[:inbound][:options][:keep_on_server] = true + @channel.save! + + # clean mailbox + imap = Net::IMAP.new(ENV['KEEP_ON_MAIL_SERVER'], 993, true, nil, false) + imap.login(@server_login, @server_password) + imap.create(@folder) + imap.select(@folder) + + # put unseen message in it + imap.append(@folder, "Subject: hello1 +From: shugo@example.com +To: shugo@example.com +Message-ID: + +hello world +".gsub(/\n/, "\r\n"), [], Time.zone.now) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + message_meta = imap.fetch(1, ['FLAGS'])[0].attr + assert_not(message_meta['FLAGS'].include?(:Seen)) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count + 1, Ticket::Article.count) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + message_meta = imap.fetch(1, ['RFC822.HEADER', 'FLAGS'])[0].attr + assert(message_meta['FLAGS'].include?(:Seen)) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count, Ticket::Article.count) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + # put unseen message in it + imap.append(@folder, "Subject: hello2 +From: shugo@example.com +To: shugo@example.com +Message-ID: + +hello world +".gsub(/\n/, "\r\n"), [], Time.zone.now) + + message_meta = imap.fetch(1, ['FLAGS'])[0].attr + assert(message_meta['FLAGS'].include?(:Seen)) + message_meta = imap.fetch(2, ['FLAGS'])[0].attr + assert_not(message_meta['FLAGS'].include?(:Seen)) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count + 1, Ticket::Article.count) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(2, message_ids.count) + + message_meta = imap.fetch(1, ['FLAGS'])[0].attr + assert(message_meta['FLAGS'].include?(:Seen)) + message_meta = imap.fetch(2, ['FLAGS'])[0].attr + assert(message_meta['FLAGS'].include?(:Seen)) + + # set messages to not seen + imap.store(1, '-FLAGS', [:Seen]) + imap.store(2, '-FLAGS', [:Seen]) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count, Ticket::Article.count) + + imap.delete(@folder) + @channel.destroy! + end + + test 'keep not on server' do + @channel.options[:inbound][:options][:keep_on_server] = false + @channel.save! + + # clean mailbox + imap = Net::IMAP.new(ENV['KEEP_ON_MAIL_SERVER'], 993, true, nil, false) + imap.login(@server_login, @server_password) + imap.create(@folder) + imap.select(@folder) + + # put unseen message in it + imap.append(@folder, "Subject: hello1 +From: shugo@example.com +To: shugo@example.com +Message-ID: + +hello world +".gsub(/\n/, "\r\n"), [], Time.zone.now) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + message_meta = imap.fetch(1, ['FLAGS'])[0].attr + assert_not(message_meta['FLAGS'].include?(:Seen)) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count + 1, Ticket::Article.count) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + # put unseen message in it + imap.append(@folder, "Subject: hello2 +From: shugo@example.com +To: shugo@example.com +Message-ID: + +hello world +".gsub(/\n/, "\r\n"), [], Time.zone.now) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + message_meta = imap.fetch(1, ['FLAGS'])[0].attr + assert_not(message_meta['FLAGS'].include?(:Seen)) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count + 1, Ticket::Article.count) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + # put unseen message in it + imap.append(@folder, "Subject: hello2 +From: shugo@example.com +To: shugo@example.com +Message-ID: + +hello world +".gsub(/\n/, "\r\n"), [], Time.zone.now) + + # verify if message is still on server + message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII') + assert_equal(1, message_ids.count) + + # fetch messages + article_count = Ticket::Article.count + @channel.fetch(true) + assert_equal(article_count + 1, Ticket::Article.count) + + imap.delete(@folder) + @channel.destroy! + + end + +end diff --git a/test/integration/geo_location_test.rb b/test/integration/geo_location_test.rb index 388378255..8bd148a9a 100644 --- a/test/integration/geo_location_test.rb +++ b/test/integration/geo_location_test.rb @@ -51,7 +51,7 @@ class GeoLocationTest < ActiveSupport::TestCase login: 'some_geo_login2', firstname: 'First', lastname: 'Last', - email: 'some_geo_login1@example.com', + email: 'some_geo_login2@example.com', password: 'test', street: 'Marienstrasse 13', city: 'Berlin', diff --git a/test/unit/activity_stream_test.rb b/test/unit/activity_stream_test.rb index 27b905ad1..8da295f33 100644 --- a/test/unit/activity_stream_test.rb +++ b/test/unit/activity_stream_test.rb @@ -10,7 +10,7 @@ class ActivityStreamTest < ActiveSupport::TestCase login: 'admin', firstname: 'Bob', lastname: 'Smith', - email: 'bob@example.com', + email: 'bob+active_stream@example.com', password: 'some_pass', active: true, roles: roles, @@ -23,7 +23,7 @@ class ActivityStreamTest < ActiveSupport::TestCase end test 'ticket+user' do - ticket = Ticket.create( + ticket = Ticket.create!( group_id: Group.lookup(name: 'Users').id, customer_id: @current_user.id, owner_id: User.lookup(login: '-').id, @@ -35,7 +35,7 @@ class ActivityStreamTest < ActiveSupport::TestCase ) travel 2.seconds - article = Ticket::Article.create( + article = Ticket::Article.create!( ticket_id: ticket.id, updated_by_id: @current_user.id, created_by_id: @current_user.id, @@ -86,12 +86,12 @@ class ActivityStreamTest < ActiveSupport::TestCase assert(stream.empty?) # cleanup - ticket.destroy + ticket.destroy! travel_back end test 'organization' do - organization = Organization.create( + organization = Organization.create!( name: 'some name', updated_by_id: @current_user.id, created_by_id: @current_user.id, @@ -125,12 +125,12 @@ class ActivityStreamTest < ActiveSupport::TestCase assert(stream.empty?) # cleanup - organization.destroy + organization.destroy! travel_back end test 'user with update check false' do - user = User.create( + user = User.create!( login: 'someemail@example.com', email: 'someemail@example.com', firstname: 'Bob Smith II', @@ -157,12 +157,12 @@ class ActivityStreamTest < ActiveSupport::TestCase assert(stream.empty?) # cleanup - user.destroy + user.destroy! travel_back end test 'user with update check true' do - user = User.create( + user = User.create!( login: 'someemail@example.com', email: 'someemail@example.com', firstname: 'Bob Smith II', @@ -204,7 +204,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert(stream.empty?) # cleanup - user.destroy + user.destroy! travel_back end diff --git a/test/unit/email_build_test.rb b/test/unit/email_build_test.rb index 7e2d3410e..8d161ea5b 100644 --- a/test/unit/email_build_test.rb +++ b/test/unit/email_build_test.rb @@ -22,6 +22,12 @@ class EmailBuildTest < ActiveSupport::TestCase assert(result !~ /font-family/, 'test 2') assert(result =~ %r{test}, 'test 2') + # Issue #1230, missing backslashes + # 'Test URL: \\storage\project\100242-Inc' + html = 'Test URL: \\\\storage\\project\\100242-Inc' + result = Channel::EmailBuild.html_complete_check(html) + assert(result.include?(html), 'backslashes must be kept') + end test 'html email + attachment check' do diff --git a/test/unit/history_test.rb b/test/unit/history_test.rb index f8061c68d..989b92152 100644 --- a/test/unit/history_test.rb +++ b/test/unit/history_test.rb @@ -155,12 +155,12 @@ class HistoryTest < ActiveSupport::TestCase # use transaction ActiveRecord::Base.transaction do - ticket = Ticket.create(test[:ticket_create][:ticket]) + ticket = Ticket.create!(test[:ticket_create][:ticket]) test[:ticket_create][:article][:ticket_id] = ticket.id - article = Ticket::Article.create(test[:ticket_create][:article]) + article = Ticket::Article.create!(test[:ticket_create][:article]) - assert_equal(ticket.class.to_s, 'Ticket') - assert_equal(article.class.to_s, 'Ticket::Article') + assert_equal(ticket.class, Ticket) + assert_equal(article.class, Ticket::Article) # update ticket if test[:ticket_update][:ticket] @@ -185,25 +185,21 @@ class HistoryTest < ActiveSupport::TestCase } # delete tickets - tickets.each { |ticket| - ticket_id = ticket.id - ticket.destroy - found = Ticket.where(id: ticket_id).first - assert_not(found, 'Ticket destroyed') - } + tickets.each(&:destroy!) end test 'user' do + name = rand(999_999) tests = [ # test 1 { user_create: { user: { - login: 'some_login_test', + login: "some_login_test-#{name}", firstname: 'Bob', lastname: 'Smith', - email: 'somebody@example.com', + email: "somebody-#{name}@example.com", active: true, updated_by_id: current_user.id, created_by_id: current_user.id, @@ -213,7 +209,7 @@ class HistoryTest < ActiveSupport::TestCase user: { firstname: 'Bob', lastname: 'Master', - email: 'master@example.com', + email: "master-#{name}@example.com", active: false, }, }, @@ -236,8 +232,8 @@ class HistoryTest < ActiveSupport::TestCase history_object: 'User', history_type: 'updated', history_attribute: 'email', - value_from: 'somebody@example.com', - value_to: 'master@example.com', + value_from: "somebody-#{name}@example.com", + value_to: "master-#{name}@example.com", }, { result: true, @@ -258,9 +254,8 @@ class HistoryTest < ActiveSupport::TestCase # user transaction ActiveRecord::Base.transaction do - user = User.create(test[:user_create][:user]) - - assert_equal(user.class.to_s, 'User') + user = User.create!(test[:user_create][:user]) + assert_equal(user.class, User) # update user if test[:user_update][:user] @@ -277,12 +272,7 @@ class HistoryTest < ActiveSupport::TestCase } # delete user - users.each { |user| - user_id = user.id - user.destroy - found = User.where(id: user_id).first - assert_not(found, 'User destroyed') - } + users.each(&:destroy!) end test 'organization' do @@ -328,9 +318,8 @@ class HistoryTest < ActiveSupport::TestCase # user transaction ActiveRecord::Base.transaction do - organization = Organization.create(test[:organization_create][:organization]) - - assert_equal(organization.class.to_s, 'Organization') + organization = Organization.create!(test[:organization_create][:organization]) + assert_equal(organization.class, Organization) # update organization if test[:organization_update][:organization] @@ -346,12 +335,7 @@ class HistoryTest < ActiveSupport::TestCase } # delete user - organizations.each { |organization| - organization_id = organization.id - organization.destroy - found = Organization.where(id: organization_id).first - assert_not(found, 'Organization destroyed') - } + organizations.each(&:destroy!) end def history_check(history_list, history_check) diff --git a/test/unit/overview_test.rb b/test/unit/overview_test.rb new file mode 100644 index 000000000..145b64951 --- /dev/null +++ b/test/unit/overview_test.rb @@ -0,0 +1,215 @@ +# encoding: utf-8 +require 'test_helper' + +class OverviewTest < ActiveSupport::TestCase + + test 'overview link' do + UserInfo.current_user_id = 1 + overview = Overview.create!( + name: 'Not Shown Admin 2', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'not_shown_admin_2') + overview.destroy! + + overview = Overview.create!( + name: 'My assigned Tickets', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'my_assigned_tickets') + overview.destroy! + + overview = Overview.create!( + name: 'Übersicht', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'ubersicht') + overview.destroy! + + overview = Overview.create!( + name: " Übersicht \n", + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'ubersicht') + overview.destroy! + + overview1 = Overview.create!( + name: 'Meine Übersicht', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview1.link, 'meine_ubersicht') + overview2 = Overview.create!( + name: 'Meine Übersicht', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert(overview2.link.start_with?('meine_ubersicht')) + assert_not_equal(overview1.link, overview2.link) + overview1.destroy! + overview2.destroy! + + overview = Overview.create!( + name: 'Д дФ ф', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_match(/^\d{1,3}$/, overview.link) + overview.destroy! + + overview = Overview.create!( + name: ' Д дФ ф abc ', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'abc') + overview.destroy! + + overview = Overview.create!( + name: 'Übersicht', + link: 'my_overview', + condition: { + 'ticket.state_id' => { + operator: 'is', + value: [1, 2, 3], + }, + }, + order: { + by: 'created_at', + direction: 'DESC', + }, + view: { + d: %w(title customer state created_at), + s: %w(number title customer state created_at), + m: %w(number title customer state created_at), + view_mode_default: 's', + }, + ) + assert_equal(overview.link, 'my_overview') + + overview.name = 'Übersicht2' + overview.link = 'my_overview2' + overview.save! + + assert_equal(overview.link, 'my_overview2') + + overview.destroy! + + end +end diff --git a/test/unit/ticket_null_byte_test.rb b/test/unit/ticket_null_byte_test.rb new file mode 100644 index 000000000..aa3fdbd6a --- /dev/null +++ b/test/unit/ticket_null_byte_test.rb @@ -0,0 +1,34 @@ +# encoding: utf-8 +require 'test_helper' + +class TicketNullByteTest < ActiveSupport::TestCase + test 'null byte test' do + ticket1 = Ticket.create!( + title: "some title \u0000 123", + group: Group.lookup(name: 'Users'), + customer_id: 2, + updated_by_id: 1, + created_by_id: 1, + ) + assert(ticket1, 'ticket created') + + article1 = Ticket::Article.create!( + ticket_id: ticket1.id, + from: 'some_customer_com-1@example.com', + to: 'some_zammad_com-1@example.com', + subject: "com test 1\u0000", + message_id: 'some@id_com_1', + body: "some\u0000message 123", + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'Customer'), + type: Ticket::Article::Type.find_by(name: 'email'), + updated_by_id: 1, + created_by_id: 1, + ) + assert(article1, 'ticket created') + + ticket1.destroy! + article1.destroy! + + end +end diff --git a/test/unit/ticket_overview_test.rb b/test/unit/ticket_overview_test.rb index 8c1acc94d..029c18e6d 100644 --- a/test/unit/ticket_overview_test.rb +++ b/test/unit/ticket_overview_test.rb @@ -302,7 +302,7 @@ class TicketOverviewTest < ActiveSupport::TestCase ) end - test 'bbb overiview index' do + test 'bbb overview index' do result = Ticket::Overviews.all( current_user: @agent1, @@ -343,7 +343,7 @@ class TicketOverviewTest < ActiveSupport::TestCase end - test 'ccc overiview content' do + test 'ccc overview content' do Ticket.destroy_all diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 799294515..89447737c 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -245,9 +245,9 @@ class UserTest < ActiveSupport::TestCase tests.each { |test| # check if user exists - user = User.where( login: test[:create][:login] ).first + user = User.where(login: test[:create][:login]).first if user - user.destroy + user.destroy! end user = User.create( test[:create] ) @@ -266,8 +266,8 @@ class UserTest < ActiveSupport::TestCase end } if test[:create_verify][:image_md5] - file = Avatar.get_by_hash( user.image ) - file_md5 = Digest::MD5.hexdigest( file.content ) + file = Avatar.get_by_hash(user.image) + file_md5 = Digest::MD5.hexdigest(file.content) assert_equal(test[:create_verify][:image_md5], file_md5, "create avatar md5 check in (#{test[:name]})") end if test[:update] @@ -275,7 +275,7 @@ class UserTest < ActiveSupport::TestCase test[:update_verify].each { |key, value| next if key == :image_md5 - if user.respond_to?( key ) + if user.respond_to?(key) assert_equal(value, user.send(key), "update check #{key} in (#{test[:name]})") else assert_equal(value, user[key], "update check #{key} in (#{test[:name]})") @@ -289,10 +289,252 @@ class UserTest < ActiveSupport::TestCase end end - user.destroy + user.destroy! } end + test 'without email - but login eq email' do + name = rand(999_999_999) + + login = "admin-role_without_email#{name}@example.com" + email = "admin-role_without_email#{name}@example.com" + admin = User.create_or_update( + login: login, + firstname: 'Role', + lastname: "Admin#{name}", + #email: "", + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + assert(admin.id) + assert_equal(admin.login, login) + assert_equal(admin.email, '') + + admin.email = email + admin.save! + + assert_equal(admin.login, login) + assert_equal(admin.email, email) + + admin.email = '' + admin.save! + + assert(admin.id) + assert(admin.login) + assert_not_equal(admin.login, login) + assert_equal(admin.email, '') + + admin.destroy! + end + + test 'without email - but login ne email' do + name = rand(999_999_999) + + login = "admin-role_without_email#{name}" + email = "admin-role_without_email#{name}@example.com" + admin = User.create_or_update( + login: login, + firstname: 'Role', + lastname: "Admin#{name}", + #email: "", + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + assert(admin.id) + assert_equal(admin.login, login) + assert_equal(admin.email, '') + + admin.email = email + admin.save! + + assert_equal(admin.login, login) + assert_equal(admin.email, email) + + admin.email = '' + admin.save! + + assert(admin.id) + assert_equal(admin.login, login) + assert_equal(admin.email, '') + + admin.destroy! + end + + test 'uniq email' do + name = rand(999_999_999) + + email1 = "admin1-role_without_email#{name}@example.com" + admin1 = User.create!( + login: email1, + firstname: 'Role', + lastname: "Admin1#{name}", + email: email1, + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + assert(admin1.id) + assert_equal(admin1.email, email1) + + assert_raises(Exceptions::UnprocessableEntity) { + User.create!( + login: "#{email1}-1", + firstname: 'Role', + lastname: "Admin1#{name}", + email: email1, + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + } + + email2 = "admin2-role_without_email#{name}@example.com" + admin2 = User.create!( + firstname: 'Role', + lastname: "Admin2#{name}", + email: email2, + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + assert_raises(Exceptions::UnprocessableEntity) { + admin2.email = email1 + admin2.save! + } + + admin1.email = admin1.email + admin1.save! + + admin2.destroy! + admin1.destroy! + end + + test 'uniq email - multiple use' do + Setting.set('user_email_multiple_use', true) + name = rand(999_999_999) + + email1 = "admin1-role_without_email#{name}@example.com" + admin1 = User.create!( + login: email1, + firstname: 'Role', + lastname: "Admin1#{name}", + email: email1, + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + assert(admin1.id) + assert_equal(admin1.email, email1) + + admin2 = User.create!( + login: "#{email1}-1", + firstname: 'Role', + lastname: "Admin1#{name}", + email: email1, + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + assert_equal(admin2.email, email1) + admin2.destroy! + admin1.destroy! + Setting.set('user_email_multiple_use', false) + end + + test 'ensure roles' do + name = rand(999_999_999) + + admin = User.create_or_update( + login: "admin-role#{name}@example.com", + firstname: 'Role', + lastname: "Admin#{name}", + email: "admin-role#{name}@example.com", + password: 'adminpw', + active: true, + roles: Role.where(name: %w(Admin Agent)), + updated_by_id: 1, + created_by_id: 1, + ) + + customer1 = User.create_or_update( + login: "user-ensure-role1-#{name}@example.com", + firstname: 'Role', + lastname: "Customer#{name}", + email: "user-ensure-role1-#{name}@example.com", + password: 'customerpw', + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + assert_equal(customer1.role_ids.sort, Role.signup_role_ids) + + roles = Role.where(name: 'Agent') + customer1.roles = roles + customer1.save! + + assert_equal(customer1.role_ids.count, 1) + assert_equal(customer1.role_ids.first, roles.first.id) + assert_equal(customer1.roles.first.id, roles.first.id) + + customer1.roles = [] + customer1.save! + + assert_equal(customer1.role_ids.sort, Role.signup_role_ids) + customer1.destroy! + + customer2 = User.create_or_update( + login: "user-ensure-role2-#{name}@example.com", + firstname: 'Role', + lastname: "Customer#{name}", + email: "user-ensure-role2-#{name}@example.com", + password: 'customerpw', + roles: roles, + active: true, + updated_by_id: 1, + created_by_id: 1, + ) + assert_equal(customer2.role_ids.count, 1) + assert_equal(customer2.role_ids.first, roles.first.id) + assert_equal(customer2.roles.first.id, roles.first.id) + + roles = Role.where(name: 'Admin') + customer2.role_ids = [roles.first.id] + customer2.save! + + assert_equal(customer2.role_ids.count, 1) + assert_equal(customer2.role_ids.first, roles.first.id) + assert_equal(customer2.roles.first.id, roles.first.id) + + customer2.roles = [] + customer2.save! + + assert_equal(customer2.role_ids.sort, Role.signup_role_ids) + customer2.destroy! + + admin.destroy! + end + test 'user default preferences' do name = rand(999_999_999) groups = Group.where(name: 'Users') @@ -352,7 +594,6 @@ class UserTest < ActiveSupport::TestCase assert(customer1.preferences['notification_config']) assert(customer1.preferences['notification_config']['matrix']['create']) assert(customer1.preferences['notification_config']['matrix']['update']) - end test 'permission' do @@ -557,7 +798,7 @@ class UserTest < ActiveSupport::TestCase # So we need to merge them with the User Nr 1 and destroy them afterwards User.with_permissions('admin').each do |user| Models.merge('User', 1, user.id) - user.destroy + user.destroy! end # store current admin count diff --git a/vendor/lib/microsoft_office365_database.rb b/vendor/lib/microsoft_office365_database.rb new file mode 100644 index 000000000..5d51c084a --- /dev/null +++ b/vendor/lib/microsoft_office365_database.rb @@ -0,0 +1,13 @@ +class MicrosoftOffice365Database < OmniAuth::Strategies::MicrosoftOffice365 + option :name, 'microsoft_office365' + + def initialize(app, *args, &block) + + # database lookup + config = Setting.get('auth_microsoft_office365_credentials') || {} + args[0] = config['app_id'] + args[1] = config['app_secret'] + super + end + +end