From 3c7d46ab603a19b77d10fe8ddc033053023df7e9 Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Sun, 12 Jan 2020 14:19:21 +0100 Subject: [PATCH 01/10] Fix design for elastic skin --- filters.php | 58 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/filters.php b/filters.php index 74d67f2..94e1be5 100644 --- a/filters.php +++ b/filters.php @@ -222,7 +222,7 @@ function filters_form(){ if (method_exists($this->rc,'imap_connect')) $this->rc->imap_connect(); else $this->rc->storage_connect(); - $table = new html_table(array('cols' => 2)); + $table = new html_table(array('cols' => 2, 'class' => 'propform cols-sm-6-6')); $table->add('title', rcube_utils::rep_specialchars_output($this->gettext('whatfilter').":", 'html')); $select = new html_select(array('name' => '_whatfilter', 'id' => 'whatfilter')); @@ -310,29 +310,55 @@ function filters_form(){ } } - $out = html::div(array('class' => 'box'), - html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('filters')). - html::div(array('class' => 'boxcontent'), $table->show() . - html::p(null, - $this->rc->output->button(array( - 'command' => 'plugin.filters-save', - 'type' => 'input', - 'class' => 'button mainaction', - 'label' => 'save' - ))))); - $out.= html::div(array('id' => 'prefs-title','class' => 'boxtitle'), $this->gettext('storedfilters')). - html::div(array('class' => 'uibox listbox scroller','style'=>'margin-top:250px;'), - html::div(array('class' => 'boxcontent'), $table2->show() )); + if ($this->rc->config->get('skin') == 'elastic') { + $out = html::tag('fieldset', array('class' => 'main'), + html::tag('legend', null, $this->gettext('mainoptions')). + $table->show() . + html::p(null, + $this->rc->output->button(array( + 'command' => 'plugin.filters-save', + 'type' => 'input', + 'class' => 'button mainaction', + 'label' => 'save' + )) + ) + ); + + $out.= html::tag('fieldset', array('id' => 'prefs-title', 'class' => 'boxtitle3'), + html::tag('legend', null, $this->gettext('storedfilters')). + $table2->show() + ); + } else { + $out = html::div(array('class' => 'box'), + html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('filters')). + html::div(array('class' => 'boxcontent'), $table->show() . + html::p(null, + $this->rc->output->button(array( + 'command' => 'plugin.filters-save', + 'type' => 'input', + 'class' => 'button mainaction', + 'label' => 'save' + ))))); + $out.= html::div(array('id' => 'prefs-title','class' => 'boxtitle'), $this->gettext('storedfilters')). + html::div(array('class' => 'uibox listbox scroller','style'=>'margin-top:250px;'), + html::div(array('class' => 'boxcontent'), $table2->show() )); + } $this->rc->output->add_gui_object('filtersform', 'filters-form'); - return $this->rc->output->form_tag(array( + $form = $this->rc->output->form_tag(array( 'id' => 'filters-form', 'name' => 'filters-form', 'method' => 'post', - 'class' => 'propform', + 'class' => 'propform cols-sm-6-6', 'action' => './?_task=settings&_action=plugin.filters-save', ), $out); + + if ($this->rc->config->get('skin') == 'elastic') { + return html::div(array('class' => 'formcontent'), $form); + } else { + return $form; + } } From 1dc8f89cb07b13796a5a31bcf56bbf9cec9e6bbf Mon Sep 17 00:00:00 2001 From: Artur Petrov Date: Tue, 14 Jan 2020 01:33:16 +0400 Subject: [PATCH 02/10] Fix design for elastic skin Fix design for elastic skin by nicolas-joubert (https://github.com/6ec123321/filters/pull/53). --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 30f0bca..f4b324a 100644 --- a/README.md +++ b/README.md @@ -118,3 +118,6 @@ History * 2.2.0: - Fixed error "filters have stopped working after an update from version 2.1.7 to 2.1.9" (https://github.com/6ec123321/filters/issues/46); - Fixed error "Folder name with single quotation marks not filtered". +* 2.2.1: + - Fix design for elastic skin - thanks to nicolas-joubert (https://github.com/6ec123321/filters/pull/53). + From be00eb1ddaeac45c709347b62db45259650840fc Mon Sep 17 00:00:00 2001 From: Artur Petrov Date: Tue, 14 Jan 2020 01:35:36 +0400 Subject: [PATCH 03/10] Fix design for elastic Fix design for elastic skin by nicolas-joubert (https://github.com/6ec123321/filters/pull/53). --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 649b716..e967591 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": ["filters","client-side","rules","spam"], "homepage": "https://github.com/6ec123321/filters", "license": "GNU GPLv3+", - "version": "2.2.0", + "version": "2.2.1", "authors": [ { "name": "Roberto Zarrelli", From 5e6c61e186bc9dafb3d3d796d459cb7c904b273c Mon Sep 17 00:00:00 2001 From: Artur Petrov Date: Tue, 14 Jan 2020 01:37:10 +0400 Subject: [PATCH 04/10] Fix design for elastic skin Fix design for elastic skin by nicolas-joubert (https://github.com/6ec123321/filters/pull/53). --- filters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filters.js b/filters.js index d378a59..7ab9b6b 100644 --- a/filters.js +++ b/filters.js @@ -3,7 +3,7 @@ * * Plugin that adds a new tab to the settings section to create client-side e-mail filtering. * - * @version 2.2.0 + * @version 2.2.1 * @author Roberto Zarrelli * @developer Artur Petrov */ From 1acaf21f8dfa706c85b63b5aca46c5c34a7c7967 Mon Sep 17 00:00:00 2001 From: Artur Petrov Date: Tue, 14 Jan 2020 01:40:37 +0400 Subject: [PATCH 05/10] Fix design for elastic skin Fix design for elastic skin by nicolas-joubert (https://github.com/6ec123321/filters/pull/53). --- package.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.xml b/package.xml index eec3dba..29f825a 100644 --- a/package.xml +++ b/package.xml @@ -11,7 +11,7 @@ Roberto Zarrelli - zarrelli@unimol.it - yes + no Artur Petrov @@ -19,9 +19,9 @@ artur@phpchain.ru yes - 2019-06-19 + 2020-01-13 - 2.2.0 + 2.2.1 2.2.0 From 6f9fd7348e4f747fb1ab652ed36dec25bb570395 Mon Sep 17 00:00:00 2001 From: Artur Petrov Date: Tue, 14 Jan 2020 02:11:06 +0400 Subject: [PATCH 06/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4b324a..02117f5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Roundcube Plugin Filters Plugin that adds a new tab to the settings section to create client-side e-mail filtering. -@version 2.2.0 +@version 2.2.1 @author Roberto Zarrelli @developer Artur Petrov From 8092edeb8d9a3aae365ed43369193b67ee5d38aa Mon Sep 17 00:00:00 2001 From: Claudiney Queiroz de Rezende Date: Sat, 8 Feb 2020 15:15:55 -0300 Subject: [PATCH 07/10] Update pt_BR.inc pt_BR translation correction --- localization/pt_BR.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/localization/pt_BR.inc b/localization/pt_BR.inc index 0747904..5a282e3 100644 --- a/localization/pt_BR.inc +++ b/localization/pt_BR.inc @@ -5,12 +5,15 @@ $labels['filters'] = 'Filtros'; $labels['storedfilters'] = 'Filtros salvos'; $labels['whatfilter'] = 'Filtro'; $labels['searchstring'] = 'Contém'; +$labels['movefrom'] = 'Verificar pasta:'; $labels['moveto'] = 'Mover para'; $labels['from'] = 'Remetente'; $labels['to'] = 'Destinatário'; $labels['cc'] = 'Cópia carbono'; $labels['subject'] = 'Assunto'; $labels['delete'] = 'Excluir'; +$labels['filterpriority'] = 'Não aplicar outras regras'; + $messages = array(); $messages['nosearchstring'] = "O campo 'Contém' não pode estar vazio."; $messages['successfullysaved'] = "O fitro foi salvo com sucesso."; @@ -20,7 +23,7 @@ $messages['unsuccessfullydeleted'] = "Erro: o filtro não foi excluído."; $messages['msg_if_field'] = 'Se o campo'; $messages['msg_contains'] = 'incluir'; $messages['msg_move_msg_in'] = 'mover a mensagem para'; +$messages['msg_move_msg_from'] = 'de'; $messages['msg_no_stored_filters'] = "Não existem filtros."; - ?> From fe144258d9fcdb263fde2071896e884d80e717c6 Mon Sep 17 00:00:00 2001 From: Claudiney Queiroz de Rezende Date: Sun, 9 Feb 2020 11:16:16 -0300 Subject: [PATCH 08/10] Update pt_BR.inc pt_BR translation correction --- localization/pt_BR.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/pt_BR.inc b/localization/pt_BR.inc index 5a282e3..ba8a225 100644 --- a/localization/pt_BR.inc +++ b/localization/pt_BR.inc @@ -5,7 +5,7 @@ $labels['filters'] = 'Filtros'; $labels['storedfilters'] = 'Filtros salvos'; $labels['whatfilter'] = 'Filtro'; $labels['searchstring'] = 'Contém'; -$labels['movefrom'] = 'Verificar pasta:'; +$labels['movefrom'] = 'Verificar pasta'; $labels['moveto'] = 'Mover para'; $labels['from'] = 'Remetente'; $labels['to'] = 'Destinatário'; From 753936553878632a216f1c214de2d95d613203d4 Mon Sep 17 00:00:00 2001 From: Adrian Wnuk <54721317+adrianwnuk@users.noreply.github.com> Date: Tue, 11 Feb 2020 19:23:14 +0100 Subject: [PATCH 09/10] Update pl_PL.inc --- localization/pl_PL.inc | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/localization/pl_PL.inc b/localization/pl_PL.inc index 4781c00..20d658f 100644 --- a/localization/pl_PL.inc +++ b/localization/pl_PL.inc @@ -1,24 +1,29 @@ From 14dfdafd3bbad2108593e3017185c617676f9438 Mon Sep 17 00:00:00 2001 From: omatosan Date: Sat, 7 Mar 2020 13:36:02 +0300 Subject: [PATCH 10/10] Fix Use of undefined constant filterid warning --- filters.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filters.php b/filters.php index 94e1be5..b32b6cd 100644 --- a/filters.php +++ b/filters.php @@ -199,8 +199,8 @@ function filters_delete(){ $this->register_handler('plugin.body', array($this, 'filters_form')); $this->rc->output->set_pagetitle($this->gettext('filters')); - if (isset($_GET[filterid])){ - $filter_id = $_GET[filterid]; + if (isset($_GET['filterid'])){ + $filter_id = $_GET['filterid']; $arr_prefs = $user->get_prefs(); $arr_prefs['filters'][$filter_id] = ''; $arr_prefs['filters'] = array_diff($arr_prefs['filters'], array(''));