Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/roundcube/roundcubemail

  • Loading branch information...
commit 1e970c2ec44e5ee43b57cc6c96b4a643e68a2b5a 2 parents ac71f6a + 174257d
@jmatth jmatth authored
Showing with 950 additions and 392 deletions.
  1. +9 −0 CHANGELOG
  2. +1 −1  index.php
  3. +7 −0 installer/check.php
  4. +7 −0 installer/config.php
  5. +0 −1  installer/index.php
  6. +6 −0 installer/rcube_install.php
  7. +7 −0 installer/test.php
  8. +1 −1  plugins/help/skins/larry/templates/help.html
  9. +2 −0  plugins/managesieve/Changelog
  10. +1 −2  plugins/managesieve/config.inc.php.dist
  11. +12 −3 plugins/managesieve/managesieve.php
  12. +9 −5 plugins/markasjunk/localization/az_AZ.inc
  13. +10 −6 plugins/markasjunk/localization/be_BE.inc
  14. +9 −5 plugins/markasjunk/localization/br.inc
  15. +9 −5 plugins/markasjunk/localization/bs_BA.inc
  16. +9 −5 plugins/markasjunk/localization/ca_ES.inc
  17. +9 −5 plugins/markasjunk/localization/cs_CZ.inc
  18. +9 −5 plugins/markasjunk/localization/cy_GB.inc
  19. +9 −5 plugins/markasjunk/localization/da_DK.inc
  20. +9 −5 plugins/markasjunk/localization/de_DE.inc
  21. +10 −6 plugins/markasjunk/localization/el_GR.inc
  22. +9 −5 plugins/markasjunk/localization/en_GB.inc
  23. +9 −5 plugins/markasjunk/localization/eo.inc
  24. +10 −6 plugins/markasjunk/localization/es_AR.inc
  25. +9 −5 plugins/markasjunk/localization/es_ES.inc
  26. +9 −5 plugins/markasjunk/localization/et_EE.inc
  27. +9 −5 plugins/markasjunk/localization/fa_IR.inc
  28. +10 −6 plugins/markasjunk/localization/fi_FI.inc
  29. +9 −5 plugins/markasjunk/localization/fr_FR.inc
  30. +10 −6 plugins/markasjunk/localization/gl_ES.inc
  31. +9 −5 plugins/markasjunk/localization/he_IL.inc
  32. +10 −6 plugins/markasjunk/localization/hr_HR.inc
  33. +9 −5 plugins/markasjunk/localization/hu_HU.inc
  34. +9 −5 plugins/markasjunk/localization/hy_AM.inc
  35. +10 −6 plugins/markasjunk/localization/id_ID.inc
  36. +9 −5 plugins/markasjunk/localization/it_IT.inc
  37. +9 −5 plugins/markasjunk/localization/ja_JP.inc
  38. +9 −5 plugins/markasjunk/localization/km_KH.inc
  39. +9 −5 plugins/markasjunk/localization/ko_KR.inc
  40. +10 −6 plugins/markasjunk/localization/ku.inc
  41. +9 −5 plugins/markasjunk/localization/lt_LT.inc
  42. +10 −6 plugins/markasjunk/localization/lv_LV.inc
  43. +10 −5 plugins/markasjunk/localization/ml_IN.inc
  44. +10 −6 plugins/markasjunk/localization/mr_IN.inc
  45. +9 −5 plugins/markasjunk/localization/nb_NO.inc
  46. +9 −5 plugins/markasjunk/localization/nl_NL.inc
  47. +9 −5 plugins/markasjunk/localization/nn_NO.inc
  48. +9 −5 plugins/markasjunk/localization/pl_PL.inc
  49. +9 −5 plugins/markasjunk/localization/pt_BR.inc
  50. +9 −5 plugins/markasjunk/localization/pt_PT.inc
  51. +9 −5 plugins/markasjunk/localization/ro_RO.inc
  52. +9 −5 plugins/markasjunk/localization/ru_RU.inc
  53. +10 −6 plugins/markasjunk/localization/si_LK.inc
  54. +9 −5 plugins/markasjunk/localization/sk_SK.inc
  55. +9 −5 plugins/markasjunk/localization/sl_SI.inc
  56. +9 −5 plugins/markasjunk/localization/sr_CS.inc
  57. +9 −5 plugins/markasjunk/localization/sv_SE.inc
  58. +9 −5 plugins/markasjunk/localization/tr_TR.inc
  59. +10 −6 plugins/markasjunk/localization/uk_UA.inc
  60. +9 −5 plugins/markasjunk/localization/vi_VN.inc
  61. +9 −5 plugins/markasjunk/localization/zh_CN.inc
  62. +9 −5 plugins/markasjunk/localization/zh_TW.inc
  63. +1 −1  program/include/iniset.php
  64. +2 −0  program/include/rcmail_output_html.php
  65. +22 −14 program/js/app.js
  66. +1 −1  program/lib/Roundcube/bootstrap.php
  67. +16 −0 program/lib/Roundcube/rcube.php
  68. +46 −4 program/lib/Roundcube/rcube_addressbook.php
  69. +55 −30 program/lib/Roundcube/rcube_charset.php
  70. +5 −20 program/lib/Roundcube/rcube_contacts.php
  71. +45 −7 program/lib/Roundcube/rcube_csv2vcard.php
  72. +1 −0  program/lib/Roundcube/rcube_db.php
  73. +3 −0  program/lib/Roundcube/rcube_db_mysql.php
  74. +2 −15 program/lib/Roundcube/rcube_ldap.php
  75. +1 −1  program/lib/Roundcube/rcube_message.php
  76. +1 −1  program/lib/Roundcube/rcube_string_replacer.php
  77. +12 −6 program/lib/Roundcube/rcube_vcard.php
  78. +2 −0  program/localization/en_US/labels.inc
  79. +99 −0 program/localization/zh_TW/csv2vcard.inc
  80. +23 −0 program/steps/addressbook/export.inc
  81. +5 −1 program/steps/addressbook/search.inc
  82. +8 −0 skins/classic/addressbook.css
  83. +1 −7 skins/classic/iehacks.css
  84. +10 −0 skins/classic/templates/addressbook.html
  85. +6 −0 skins/larry/iehacks.css
  86. +1 −1  skins/larry/mail.css
  87. +7 −6 skins/larry/styles.css
  88. +1 −1  skins/larry/templates/about.html
  89. +11 −1 skins/larry/templates/addressbook.html
  90. +18 −0 tests/Framework/Charset.php
  91. +1 −0  tests/Framework/Csv2vcard.php
  92. +2 −0  tests/Framework/StringReplacer.php
  93. +15 −0 tests/Framework/VCard.php
  94. +2 −0  tests/src/Csv2vcard/tb_plain.vcf
View
9 CHANGELOG
@@ -1,6 +1,15 @@
CHANGELOG Roundcube Webmail
===========================
+- Feature to export only selected contacts from addressbook (by Phil Weir)
+- Force autocommit mode in mysql database driver (#1488902)
+
+RELEASE 0.9-beta
+----------------
+- Fix searching by date in address book (#1488888)
+- Improve charset detection by prioritizing charset according to user language (#1485669)
+- Fix handling of escaped separator in vCard file (#1488896)
+- Fix #countcontrols issue in IE<=8 when text is very long (#1488890)
- Add option to use envelope From address for MDN responses (#1488880)
- Add possibility to search in message body only (#1488770)
- Support "multipart/relative" as an alias for "multipart/related" type (#1488886)
View
2  index.php
@@ -4,7 +4,7 @@
| Roundcube Webmail IMAP Client |
| Version 0.9-git |
| |
- | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
| |
| This program is free software: you can redistribute it and/or modify |
| it under the terms of the GNU General Public License (with exceptions |
View
7 installer/check.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+ die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
<form action="index.php" method="get">
<?php
View
7 installer/config.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+ die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
<form action="index.php" method="post">
<input type="hidden" name="_step" value="2" />
<?php
View
1  installer/index.php
@@ -44,7 +44,6 @@
define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
-$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
$include_path .= ini_get('include_path');
View
6 installer/rcube_install.php
@@ -261,6 +261,11 @@ function check_config()
}
}
+ // the old default mime_magic reference is obsolete
+ if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
+ $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
+ }
+
// iterate over default config
foreach ($defaults as $prop => $value) {
if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))
@@ -452,6 +457,7 @@ function versions_select($attrib = array())
'0.6-beta', '0.6',
'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
'0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4',
+ '0.9-beta',
));
return $select;
}
View
7 installer/test.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+ die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
<form action="index.php?_step=3" method="post">
<h3>Check config files</h3>
View
2  plugins/help/skins/larry/templates/help.html
@@ -19,7 +19,7 @@
<div id="pluginbody" class="uibox offset">
<div class="iframebox help_<roundcube:var name='env:action' />">
- <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" src="/watermark.html" />
+ <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
</div>
<roundcube:object name="message" id="message" class="statusbar" />
</div>
View
2  plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Support tls:// prefix in managesieve_host option
+
* version 6.1 [2012-12-21]
-----------------------------------------------------------
- Fixed filter activation/deactivation confirmation message (#1488765)
View
3  plugins/managesieve/config.inc.php.dist
@@ -25,8 +25,7 @@ $rcmail_config['managesieve_auth_cid'] = null;
$rcmail_config['managesieve_auth_pw'] = null;
// use or not TLS for managesieve server connection
-// it's because I've problems with TLS and dovecot's managesieve plugin
-// and it's not needed on localhost
+// Note: tls:// prefix in managesieve_host is also supported
$rcmail_config['managesieve_usetls'] = false;
// default contents of filters script (eg. default spam filter)
View
15 plugins/managesieve/managesieve.php
@@ -200,10 +200,19 @@ function managesieve_start()
$include_path .= ini_get('include_path');
set_include_path($include_path);
- $host = rcube_parse_host($this->rc->config->get('managesieve_host', 'localhost'));
+ // Get connection parameters
+ $host = $this->rc->config->get('managesieve_host', 'localhost');
+ $port = $this->rc->config->get('managesieve_port');
+ $tls = $this->rc->config->get('managesieve_usetls', false);
+
+ $host = rcube_parse_host($host);
$host = rcube_idn_to_ascii($host);
- $port = $this->rc->config->get('managesieve_port');
+ // remove tls:// prefix, set TLS flag
+ if (($host = preg_replace('|^tls://|i', '', $host, 1, $cnt)) && $cnt) {
+ $tls = true;
+ }
+
if (empty($port)) {
$port = getservbyname('sieve', 'tcp');
if (empty($port)) {
@@ -216,8 +225,8 @@ function managesieve_start()
'password' => $this->rc->decrypt($_SESSION['password']),
'host' => $host,
'port' => $port,
+ 'usetls' => $tls,
'auth_type' => $this->rc->config->get('managesieve_auth_type'),
- 'usetls' => $this->rc->config->get('managesieve_usetls', false),
'disabled' => $this->rc->config->get('managesieve_disabled_extensions'),
'debug' => $this->rc->config->get('managesieve_debug', false),
'auth_cid' => $this->rc->config->get('managesieve_auth_cid'),
View
14 plugins/markasjunk/localization/az_AZ.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Spam qovluğuna köçür';
$labels['reportedasjunk'] = 'Spam qovluğuna köçürüldü';
+?>
View
16 plugins/markasjunk/localization/be_BE.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Пазначыць як спам';
$labels['reportedasjunk'] = 'Паспяхова пазначаны як спам';
+?>
View
14 plugins/markasjunk/localization/br.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/br/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Denis |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Lastez';
$labels['buttontitle'] = 'Merkañ evel lastez';
$labels['reportedasjunk'] = 'Danevellet evel lastez gant berzh';
+?>
View
14 plugins/markasjunk/localization/bs_BA.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Označi kao spam';
$labels['reportedasjunk'] = 'Uspješno označeno kao spam';
+?>
View
14 plugins/markasjunk/localization/ca_ES.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Correu brossa';
$labels['buttontitle'] = 'Marca com a Spam';
$labels['reportedasjunk'] = 'S\'ha reportat correctament com a Spam';
+?>
View
14 plugins/markasjunk/localization/cs_CZ.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Tomáš Kyzlink |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Označit jako Spam';
$labels['reportedasjunk'] = 'Úspěšně nahlášeno jako Spam';
+?>
View
14 plugins/markasjunk/localization/cy_GB.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Dafydd Tomos |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Sothach';
$labels['buttontitle'] = 'Nodi fel Sbwriel';
$labels['reportedasjunk'] = 'Adroddwyd yn llwyddiannus fel Sbwriel';
+?>
View
14 plugins/markasjunk/localization/da_DK.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Marker som spam mail';
$labels['reportedasjunk'] = 'Successfuldt rapporteret som spam mail';
+?>
View
14 plugins/markasjunk/localization/de_DE.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'als SPAM markieren';
$labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
+?>
View
16 plugins/markasjunk/localization/el_GR.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Σήμανση ως Ανεπιθύμητου';
$labels['reportedasjunk'] = 'Αναφέρθηκε ως Ανεπιθήμητο';
+?>
View
14 plugins/markasjunk/localization/en_GB.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Christian Foellmann <foellmann@foe-services.de> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Mark as Junk';
$labels['reportedasjunk'] = 'Successfully reported as Junk';
+?>
View
14 plugins/markasjunk/localization/eo.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/eo/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rubaĵo';
$labels['buttontitle'] = 'Marki kiel rubaĵo';
$labels['reportedasjunk'] = 'Sukcese raportita kiel rubaĵo';
+?>
View
16 plugins/markasjunk/localization/es_AR.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Correo no deseado';
$labels['buttontitle'] = 'Marcar como SPAM';
$labels['reportedasjunk'] = 'Mensaje reportado como SPAM';
+?>
View
14 plugins/markasjunk/localization/es_ES.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: pompilos <ciordia@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'SPAM';
$labels['buttontitle'] = 'Marcar como SPAM';
$labels['reportedasjunk'] = 'Mensaje informado como SPAM';
+?>
View
14 plugins/markasjunk/localization/et_EE.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: yllar |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rämps';
$labels['buttontitle'] = 'Märgista Rämpsuks';
$labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud';
+?>
View
14 plugins/markasjunk/localization/fa_IR.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'بنجل';
$labels['buttontitle'] = 'علامت گذاری به عنوان بنجل';
$labels['reportedasjunk'] = 'با موفقیت به عنوان بنجل گزارش شد';
+?>
View
16 plugins/markasjunk/localization/fi_FI.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Jiri Grönroos |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
$labels['buttontext'] = 'Roskaposti';
$labels['buttontitle'] = 'Merkitse roskapostiksi';
-$labels['reportedasjunk'] = 'Ilmoitettu onnistuneesti roskapostista';
+$labels['reportedasjunk'] = 'Roskapostista on ilmoitettu onnistuneesti';
+?>
View
14 plugins/markasjunk/localization/fr_FR.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Nicolas Delvaux |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Indésirables';
$labels['buttontitle'] = 'Marquer comme indésirable';
$labels['reportedasjunk'] = 'Notification de message indésirable envoyée';
+?>
View
16 plugins/markasjunk/localization/gl_ES.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Marcar como correo lixo';
$labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo';
+?>
View
14 plugins/markasjunk/localization/he_IL.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'זבל';
$labels['buttontitle'] = 'סמן כדואר זבל';
$labels['reportedasjunk'] = 'דואר הזבל דווח בהצלחה';
+?>
View
16 plugins/markasjunk/localization/hr_HR.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Označi kao smeće (spam)';
$labels['reportedasjunk'] = 'Uspješno prijavljeno kao smeće (spam)';
+?>
View
14 plugins/markasjunk/localization/hu_HU.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Németh András <narzym@hotmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Levélszemét';
$labels['buttontitle'] = 'Szemétnek jelölés';
$labels['reportedasjunk'] = 'Sikeresen szemétnek jelentve';
+?>
View
14 plugins/markasjunk/localization/hy_AM.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Թափոն';
$labels['buttontitle'] = 'Նշել որպես Թափոն';
$labels['reportedasjunk'] = 'Բարեհաջող հաղորդվեց որպես Թափոն';
+?>
View
16 plugins/markasjunk/localization/id_ID.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Tandai sebagai sampah';
$labels['reportedasjunk'] = 'Berhasil dilaporkan sebagai sampah';
+?>
View
14 plugins/markasjunk/localization/it_IT.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Marca come Spam';
$labels['reportedasjunk'] = 'Messaggio marcato come Spam';
+?>
View
14 plugins/markasjunk/localization/ja_JP.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Takahiro Kambe |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '迷惑メール';
$labels['buttontitle'] = '迷惑メールとして設定';
$labels['reportedasjunk'] = '迷惑メールとして報告しました。';
+?>
View
14 plugins/markasjunk/localization/km_KH.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: samdyk |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'សំបុត្រមិនល្អ';
$labels['buttontitle'] = 'ចាត់ជា សំបុត្រមិនល្អ';
$labels['reportedasjunk'] = 'រាយការណ៏ថាជា សំបុត្រមិនល្អ បានសំរេច';
+?>
View
14 plugins/markasjunk/localization/ko_KR.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '정크메일';
$labels['buttontitle'] = '정크메일로 표시';
$labels['reportedasjunk'] = '성공적으로, 정크메일이라 보고 됨';
+?>
View
16 plugins/markasjunk/localization/ku.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/ku/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: david absalan <absalan@live.com> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'nawnişani bka ba şkaw';
$labels['reportedasjunk'] = 'ba gşti raport kra';
+?>
View
14 plugins/markasjunk/localization/lt_LT.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Brukalas';
$labels['buttontitle'] = 'Žymėti kaip brukalą';
$labels['reportedasjunk'] = 'Sėkmingai pranešta, jog laiškas yra brukalas';
+?>
View
16 plugins/markasjunk/localization/lv_LV.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Iezīmēt kā mēstuli';
$labels['reportedasjunk'] = 'Sekmīgi iezīmēta kā mēstule';
+?>
View
15 plugins/markasjunk/localization/ml_IN.inc
@@ -2,18 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തുക';
$labels['reportedasjunk'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തി';
+?>
View
16 plugins/markasjunk/localization/mr_IN.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'नको असलेला अशी खूण करा';
$labels['reportedasjunk'] = 'नको आहे असे यशस्वीरीत्या नक्की केले';
+?>
View
14 plugins/markasjunk/localization/nb_NO.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Useriøs e-post';
$labels['buttontitle'] = 'Marker som useriøs e-post';
$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykket';
+?>
View
14 plugins/markasjunk/localization/nl_NL.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Geert Wirken |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Markeer als spam';
$labels['reportedasjunk'] = 'Succesvol gemarkeerd als spam';
+?>
View
14 plugins/markasjunk/localization/nn_NO.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Useriøs e-post';
$labels['buttontitle'] = 'Marker som useriøs e-post';
$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykka';
+?>
View
14 plugins/markasjunk/localization/pl_PL.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Oznacz jako SPAM';
$labels['reportedasjunk'] = 'Pomyślnie oznaczono jako SPAM';
+?>
View
14 plugins/markasjunk/localization/pt_BR.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Marcar como Spam';
$labels['reportedasjunk'] = 'Marcado como Spam com sucesso';
+?>
View
14 plugins/markasjunk/localization/pt_PT.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: David |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Lixo';
$labels['buttontitle'] = 'Marcar como Lixo';
$labels['reportedasjunk'] = 'Reportado como Lixo com sucesso';
+?>
View
14 plugins/markasjunk/localization/ro_RO.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Vechituri';
$labels['buttontitle'] = 'Marchează ca SPAM';
$labels['reportedasjunk'] = 'Raportat cu succes ca SPAM';
+?>
View
14 plugins/markasjunk/localization/ru_RU.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'СПАМ';
$labels['buttontitle'] = 'Переместить в "СПАМ';
$labels['reportedasjunk'] = 'Перемещено в "СПАМ';
+?>
View
16 plugins/markasjunk/localization/si_LK.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'සුන්බුන් ලෙස සලකුණු කරන්න';
$labels['reportedasjunk'] = 'සුන්බුන් ලෙස වාර්තා කිරීම සාර්ථකයි';
+?>
View
14 plugins/markasjunk/localization/sk_SK.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: panda |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
$labels['buttontitle'] = 'Označiť ako Spam';
$labels['reportedasjunk'] = 'Úspešne nahlásené ako Spam';
+?>
View
14 plugins/markasjunk/localization/sl_SI.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Nezaželena sporočila';
$labels['buttontitle'] = 'Označi kot spam';
$labels['reportedasjunk'] = 'Uspešno označeno kot spam';
+?>
View
14 plugins/markasjunk/localization/sr_CS.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Смеће';
$labels['buttontitle'] = 'Означи као cмеће';
$labels['reportedasjunk'] = 'Успешно пријављени као cмеће';
+?>
View
14 plugins/markasjunk/localization/sv_SE.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Jonas Nasholm |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Skräp';
$labels['buttontitle'] = 'Märk som skräp';
$labels['reportedasjunk'] = 'Framgångsrikt rapporterat som skräp';
+?>
View
14 plugins/markasjunk/localization/tr_TR.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: ismail yenigul |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'İstenmeyen';
$labels['buttontitle'] = 'Çöp olarak işaretle';
$labels['reportedasjunk'] = 'Spam olarak rapor edildi';
+?>
View
16 plugins/markasjunk/localization/uk_UA.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown> |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
+$labels['buttontext'] = 'Junk';
$labels['buttontitle'] = 'Перемістити в "Спам';
$labels['reportedasjunk'] = 'Переміщено до "Спаму';
+?>
View
14 plugins/markasjunk/localization/vi_VN.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Thư rác';
$labels['buttontitle'] = 'Đánh dấu để được xem là thư rác';
$labels['reportedasjunk'] = 'Đánh dấu để được xem là thư rác thành công';
+?>
View
14 plugins/markasjunk/localization/zh_CN.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com> |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾邮件';
$labels['buttontitle'] = '标记为垃圾邮件';
$labels['reportedasjunk'] = '成功报告该邮件为垃圾邮件';
+?>
View
14 plugins/markasjunk/localization/zh_TW.inc
@@ -2,15 +2,18 @@
/*
+-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc |
+ | plugins/markasjunk/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Nansen |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
*/
$labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾郵件';
$labels['buttontitle'] = '標示為垃圾信';
$labels['reportedasjunk'] = '成功回報垃圾信';
+?>
View
2  program/include/iniset.php
@@ -5,7 +5,7 @@
| program/include/iniset.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2012, The Roundcube Dev Team |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
View
2  program/include/rcmail_output_html.php
@@ -462,6 +462,7 @@ function parse($name = 'main', $exit = true, $write = true)
if (is_readable($path)) {
$this->config->set('skin_path', $skin_path);
$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
+ $skin_dir = preg_replace('!^plugins/!', '', $skin_path);
break;
}
else {
@@ -643,6 +644,7 @@ protected function fix_paths($output)
protected function file_callback($matches)
{
$file = $matches[3];
+ $file[0] = preg_replace('!^/this/!', '/', $file[0]);
// correct absolute paths
if ($file[0] == '/') {
View
36 program/js/app.js
@@ -361,7 +361,7 @@ function rcube_webmail()
if (this.gui_objects.editform) {
this.enable_command('save', true);
- if (this.env.action == 'add' || this.env.action == 'edit')
+ if (this.env.action == 'add' || this.env.action == 'edit' || this.env.action == 'search')
this.init_contact_form();
}
@@ -509,7 +509,7 @@ function rcube_webmail()
return false;
// let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
- if ((obj && obj.href && String(obj.href).indexOf(location.href) < 0) && rcube_event.get_modifier(event)) {
+ if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) {
return true;
}
@@ -1090,6 +1090,12 @@ function rcube_webmail()
}
break;
+ case 'export-selected':
+ if (this.contact_list.rowcount > 0) {
+ this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') });
+ }
+ break;
+
case 'upload-photo':
this.upload_contact_photo(props || this.gui_objects.uploadform);
break;
@@ -3037,7 +3043,7 @@ function rcube_webmail()
ac_props;
// close compose step in opener
- if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
+ if (window.opener && !window.opener.closed && opener.rcmail && opener.rcmail.env.action == 'compose') {
setTimeout(function(){ opener.history.back(); }, 100);
this.env.opened_extwin = true;
}
@@ -3707,9 +3713,10 @@ function rcube_webmail()
{
this.display_message(msg, type);
- if (this.env.extwin && window.opener && opener.rcmail) {
+ if (this.env.extwin) {
this.lock_form(this.gui_objects.messageform);
- opener.rcmail.display_message(msg, type);
+ if (window.opener && !window.opener.closed && opener.rcmail)
+ opener.rcmail.display_message(msg, type);
setTimeout(function(){ window.close() }, 1000);
}
else {
@@ -4115,6 +4122,7 @@ function rcube_webmail()
// thend we can enable the group-remove-selected command
this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0);
this.enable_command('compose', this.env.group || list.selection.length > 0);
+ this.enable_command('export-selected', list.selection.length > 0);
this.enable_command('edit', id && writable);
this.enable_command('delete', list.selection.length && writable);
@@ -4219,12 +4227,10 @@ function rcube_webmail()
target = win;
this.show_contentframe(true);
- // load dummy content
- if (!cid) {
- // unselect selected row(s)
+ // load dummy content, unselect selected row(s)
+ if (!cid)
this.contact_list.clear_selection();
- this.enable_command('delete', 'compose', false);
- }
+ this.enable_command('delete', 'compose', 'export-selected', cid);
}
else if (framed)
return false;
@@ -4396,10 +4402,11 @@ function rcube_webmail()
{
var ref = this, col;
- this.set_photo_actions($('#ff_photo').val());
-
- for (col in this.env.coltypes)
- this.init_edit_field(col, null);
+ if (this.env.coltypes) {
+ this.set_photo_actions($('#ff_photo').val());
+ for (col in this.env.coltypes)
+ this.init_edit_field(col, null);
+ }
$('.contactfieldgroup .row a.deletebutton').click(function() {
ref.delete_edit_field(this);
@@ -6238,6 +6245,7 @@ function rcube_webmail()
this.enable_command('compose', (uid && this.contact_list.rows[uid]));
this.enable_command('delete', 'edit', writable);
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+ this.enable_command('export-selected', false);
}
case 'moveto':
View
2  program/lib/Roundcube/bootstrap.php
@@ -3,7 +3,7 @@
/*
+-----------------------------------------------------------------------+
| This file is part of the Roundcube PHP suite |
- | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
View
16 program/lib/Roundcube/rcube.php <