Merge pull request #4 from YetiForceCompany/developer

lib_roundcube 0.0.31
YetiForceCompany · Aug 1, 2017 · e236c79 · e236c79
2 parents fc30b68 + 3926047
commit e236c79
Show file tree

Hide file tree

Showing 37 changed files with 3,246 additions and 3,297 deletions.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -4,7 +4,7 @@
   If your IMAP/SMTP servers are on the same host or are connected via a secure network, not using SSL connections improves performance. So don't use "ssl://" or "tls://" urls for 'default_host' and 'smtp_server' config options.
  */
 $currentPath = getcwd();
-chdir(dirname(__FILE__) . '/../../../../');
+chdir(dirname(__FILE__) . '/../../../../../');
 include_once('include/ConfigUtils.php');
 include_once('config/modules/OSSMail.php');
 chdir($currentPath);
diff --git a/plugins/thunderbird_labels/Changelog b/plugins/thunderbird_labels/Changelog
@@ -1,3 +1,10 @@
+v1.1.3
+---
+- dsoares pull request: Enable or disable the plugin button on message selection.
+- dsoares pull request: unecessary skin checks removed
+- dsoares pull request: deprecated code fixed
+- petrkle pull request: Czech translation fixes
+
 v1.0
 ---
 + added Ukranian translation by Mykyta Solomko

diff --git a/plugins/thunderbird_labels/LICENSE.md b/plugins/thunderbird_labels/LICENSE.md
@@ -0,0 +1,10 @@
+Copyright (c) Michael Kefeder (MK) and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY MK AND THE CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MK OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/thunderbird_labels/README b/plugins/thunderbird_labels/README
diff --git a/plugins/thunderbird_labels/composer.json b/plugins/thunderbird_labels/composer.json
@@ -1,21 +1,22 @@
 {
-    "name": "weird-birds/thunderbird_labels",
-    "type": "roundcube-plugin",
-    "keywords": ["mail","labels","tags"],
-    "authors": [
-        {
-            "name": "Michael Kefeder",
-            "homepage": "https://github.com/mike-kfed/rcmail-thunderbird-labels",
-            "role": "Developer"
-        }
-    ],
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "http://plugins.roundcube.net"
-        }
-    ],
-    "require": {
-        "roundcube/plugin-installer": ">=0.1.3"
-    }
+	"name": "weird-birds/thunderbird_labels",
+	"type": "roundcube-plugin",
+	"keywords": ["mail", "labels", "tags"],
+	"license": "BSD-2-Clause",
+	"authors": [
+		{
+			"name": "Michael Kefeder",
+			"homepage": "https://github.com/mike-kfed/rcmail-thunderbird-labels",
+			"role": "Developer"
+		}
+	],
+	"repositories": [
+		{
+			"type": "composer",
+			"url": "http://plugins.roundcube.net"
+		}
+	],
+	"require": {
+		"roundcube/plugin-installer": ">=0.1.3"
+	}
 }
diff --git a/plugins/thunderbird_labels/config.inc.php b/plugins/thunderbird_labels/config.inc.php
@@ -1,12 +1,12 @@
 <?php
-  // whether to globally enable thunderbird labels
-  $rcmail_config['tb_label_enable'] = true;
-  // add labels to contextmenu (if contextmenu plugin is present)
-  $rcmail_config['tb_label_enable_contextmenu'] = true;
-  // enable kb shortcuts (1-5)
-  $rcmail_config['tb_label_enable_shortcuts'] = true;
-  // users can modify labels
-  $rcmail_config['tb_label_modify_labels'] = true;
-  // style for UI: 'bullets' or 'thunderbird'
-  $rcmail_config['tb_label_style'] = "bullets";
+// whether to globally enable thunderbird labels
+$rcmail_config['tb_label_enable'] = true;
+// add labels to contextmenu (if contextmenu plugin is present)
+$rcmail_config['tb_label_enable_contextmenu'] = true;
+// enable kb shortcuts (1-5)
+$rcmail_config['tb_label_enable_shortcuts'] = true;
+// users can modify labels
+$rcmail_config['tb_label_modify_labels'] = true;
+// style for UI: 'bullets' or 'thunderbird'
+$rcmail_config['tb_label_style'] = "bullets";
 
diff --git a/plugins/thunderbird_labels/localization/bg_BG.inc b/plugins/thunderbird_labels/localization/bg_BG.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Deyan Stoykov
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Deyan Stoykov
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Thunderbird етикети';
 $labels['label0'] = 'Без етикет';

diff --git a/plugins/thunderbird_labels/localization/ca_ES.inc b/plugins/thunderbird_labels/localization/ca_ES.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Lluís Forns Puigmartí
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Lluís Forns Puigmartí
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Etiquetes';
 $labels['label0'] = 'Cap etiqueta';

diff --git a/plugins/thunderbird_labels/localization/cs_CZ.inc b/plugins/thunderbird_labels/localization/cs_CZ.inc
@@ -1,5 +1,4 @@
 <?php
-
 $labels = array();
 $labels['label'] = 'Štítky';
 $labels['label0'] = 'Žádný štítek';

diff --git a/plugins/thunderbird_labels/localization/de_DE.inc b/plugins/thunderbird_labels/localization/de_DE.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Michael Kefeder
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Michael Kefeder
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Thunderbird Schlagwörter';
 $labels['label0'] = 'Alle Entfernen';

diff --git a/plugins/thunderbird_labels/localization/en_US.inc b/plugins/thunderbird_labels/localization/en_US.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Michael Kefeder
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Michael Kefeder
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Thunderbird Labels';
 $labels['label0'] = 'No Label';

diff --git a/plugins/thunderbird_labels/localization/es_ES.inc b/plugins/thunderbird_labels/localization/es_ES.inc
@@ -1,14 +1,14 @@
 <?php
 /*
- +-----------------------------------------------------------------------+
-| Localization file of the Roundcube Thunderbird Labels plugin          |
-| Copyright (C) 2013, JPL TSolucio, S.L. (Joe Bordes)                   |
-|                                                                       |
-| Licensed under the GNU General Public License version 3 or            |
-| any later version.                                                    |
-|                                                                       |
-+-----------------------------------------------------------------------+
-*/
+  +-----------------------------------------------------------------------+
+  | Localization file of the Roundcube Thunderbird Labels plugin          |
+  | Copyright (C) 2013, JPL TSolucio, S.L. (Joe Bordes)                   |
+  |                                                                       |
+  | Licensed under the GNU General Public License version 3 or            |
+  | any later version.                                                    |
+  |                                                                       |
+  +-----------------------------------------------------------------------+
+ */
 
 $labels = array();
 $labels['label'] = 'Etiquetas Thunderbird';

diff --git a/plugins/thunderbird_labels/localization/fr_FR.inc b/plugins/thunderbird_labels/localization/fr_FR.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Michael Kefeder
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Michael Kefeder
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Tags Thunderbird ';
 $labels['label0'] = 'Aucun tag';
@@ -21,4 +20,4 @@ $labels['tb_label_button_label'] = 'Tags';
 $labels['tb_label_button_title'] = 'Affecter des tags aux messages';
 $labels['tb_label_contextmenu_title'] = 'Tags';
 $labels['tb_label_style_option'] = 'Style graphique';
-$labels['tb_label_label'] = "Tag";
+$labels['tb_label_label'] = "Tag";
diff --git a/plugins/thunderbird_labels/localization/hu_HU.inc b/plugins/thunderbird_labels/localization/hu_HU.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Daniel P. 
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Daniel P. 
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Thunderbird Cimkék';
 $labels['label0'] = 'Minden cimke törlése';

diff --git a/plugins/thunderbird_labels/localization/it_IT.inc b/plugins/thunderbird_labels/localization/it_IT.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Samuele Tognini <samuele@samuele.netsons.org>
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Samuele Tognini <samuele@samuele.netsons.org>
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Etichette Thunderbird';
 $labels['label0'] = 'Nessuna etichetta';

diff --git a/plugins/thunderbird_labels/localization/lv_LV.inc b/plugins/thunderbird_labels/localization/lv_LV.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Artem Ushakov
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Artem Ushakov
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Vēstules atzīme';
 $labels['label0'] = 'Izdzēst visas atzīmes';

diff --git a/plugins/thunderbird_labels/localization/pl_PL.inc b/plugins/thunderbird_labels/localization/pl_PL.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* master771
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * master771
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Etykiety';
 $labels['label0'] = 'Brak';

diff --git a/plugins/thunderbird_labels/localization/ru_RU.inc b/plugins/thunderbird_labels/localization/ru_RU.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Николай Николай
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Николай Николай
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Метка Thunderbird';
 $labels['label0'] = 'Удалить все метки';

diff --git a/plugins/thunderbird_labels/localization/uk_UA.inc b/plugins/thunderbird_labels/localization/uk_UA.inc
@@ -1,10 +1,9 @@
 <?php
 /**
-* Author:
-* Mykyta Solomko
-* http://code.google.com/p/rcmail-thunderbird-labels/
-*/
-
+ * Author:
+ * Mykyta Solomko
+ * http://code.google.com/p/rcmail-thunderbird-labels/
+ */
 $labels = array();
 $labels['label'] = 'Мітки Thunderbird';
 $labels['label0'] = 'Без мітки';