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

Thomas Bruederli

2012-11-11 e43dcb0df3e7ea6c05a8c1473b0da7834d5e39d9

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

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix bug where leading blanks were stripped from quoted lines (#1488795)
- Upgraded to jQuery 1.8.2 and jQuery UI 1.9.1
- Add config option to automatically generate LDAP attributes for new entries
- Better client-side timezone detection using the jsTimezoneDetect library (#1488725)

 installer/rcube_install.php

@@ -454,7 +454,7 @@
        '0.5-beta', '0.5', '0.5.1',
        '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-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3',
    ));
    return $select;
  }

 plugins/help/package.xml

@@ -13,9 +13,9 @@
        <email>alec@alec.pl</email>
        <active>yes</active>
    </lead>
    <date>2012-01-18</date>
    <date>2012-11-11</date>
    <version>
        <release>1.2</release>
        <release>1.3</release>
        <api>1.2</api>
    </version>
    <stability>
@@ -30,27 +30,52 @@
                <tasks:replace from="@name@" to="name" type="package-info"/>
                <tasks:replace from="@package_version@" to="version" type="package-info"/>
            </file>
            <file name="config.inc.php.dist" role="data"></file>
            <file name="content/about.html" role="data"></file>
            <file name="content/license.html" role="data"></file>
            <file name="config.inc.php.dist" role="data"></file>
            <file name="localization/bs_BA.inc" role="data"></file>
            <file name="localization/ca_ES.inc" role="data"></file>
            <file name="localization/cs_CZ.inc" role="data"></file>
            <file name="localization/cy_GB.inc" role="data"></file>
            <file name="localization/da_DK.inc" role="data"></file>
            <file name="localization/de_CH.inc" role="data"></file>
            <file name="localization/de_DE.inc" role="data"></file>
            <file name="localization/en_GB.inc" role="data"></file>
            <file name="localization/en_US.inc" role="data"></file>
            <file name="localization/eo.inc" role="data"></file>
            <file name="localization/es_ES.inc" role="data"></file>
            <file name="localization/et_EE.inc" role="data"></file>
            <file name="localization/fa_IR.inc" role="data"></file>
            <file name="localization/fi_FI.inc" role="data"></file>
            <file name="localization/fr_FR.inc" role="data"></file>
            <file name="localization/gl_ES.inc" role="data"></file>
            <file name="localization/he_IL.inc" role="data"></file>
            <file name="localization/hu_HU.inc" role="data"></file>
            <file name="localization/hy_AM.inc" role="data"></file>
            <file name="localization/it_IT.inc" role="data"></file>
            <file name="localization/ja_JP.inc" role="data"></file>
            <file name="localization/ko_KR.inc" role="data"></file>
            <file name="localization/lt_LT.inc" role="data"></file>
            <file name="localization/nb_NB.inc" role="data"></file>
            <file name="localization/nl_NL.inc" role="data"></file>
            <file name="localization/pl_PL.inc" role="data"></file>
            <file name="localization/pt_BR.inc" role="data"></file>
            <file name="localization/pt_PT.inc" role="data"></file>
            <file name="localization/ru_RU.inc" role="data"></file>
            <file name="localization/sk_SK.inc" role="data"></file>
            <file name="localization/sl_SI.inc" role="data"></file>
            <file name="localization/sr_CS.inc" role="data"></file>
            <file name="localization/sv_SE.inc" role="data"></file>
            <file name="localization/tr_TR.inc" role="data"></file>
            <file name="localization/vi_VN.inc" role="data"></file>
            <file name="localization/zh_CN.inc" role="data"></file>
            <file name="localization/zh_TW.inc" role="data"></file>
            <file name="skins/classic/help.css" role="data"></file>
            <file name="skins/classic/help.gif" role="data"></file>
            <file name="skins/classic/templates/help.html" role="data"></file>
            <file name="localization/cs_CZ.inc" role="data"></file>
            <file name="localization/da_DK.inc" role="data"></file>
            <file name="localization/de_DE.inc" role="data"></file>
            <file name="localization/en_US.inc" role="data"></file>
            <file name="localization/es_ES.inc" role="data"></file>
            <file name="localization/et_EE.inc" role="data"></file>
            <file name="localization/fr_FR.inc" role="data"></file>
            <file name="localization/gl_ES.inc" role="data"></file>
            <file name="localization/hu_HU.inc" role="data"></file>
            <file name="localization/ja_JP.inc" role="data"></file>
            <file name="localization/pl_PL.inc" role="data"></file>
            <file name="localization/pt_BR.inc" role="data"></file>
            <file name="localization/ru_RU.inc" role="data"></file>
            <file name="localization/sv_SE.inc" role="data"></file>
            <file name="localization/zh_TW.inc" role="data"></file>
            <file name="skins/larry/help.css" role="data"></file>
            <file name="skins/larry/help.png" role="data"></file>
            <file name="skins/larry/templates/help.html" role="data"></file>
        </dir>
        <!-- / -->
    </contents>

 plugins/help/skins/larry/help.css

@@ -38,3 +38,8 @@
.toolbar a.button.license {
    background: url(help.png) center -130px no-repeat;
}

.iframebox.help_about,
.iframebox.help_license {
    overflow: auto;
}

 plugins/help/skins/larry/templates/help.html

@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/this/help.css" />
</head>
<body>

@@ -18,8 +17,11 @@
<roundcube:container name="helptabs" id="helptabsbar" />
</div>

<div id="pluginbody" class="uibox offset scroller">
<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:99%" src="/watermark.html" />
<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" />
    </div>
    <roundcube:object name="message" id="message" class="statusbar" />
</div>

</div>

 program/steps/mail/func.inc

@@ -801,8 +801,8 @@

  // find/mark quoted lines...
  for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
    if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) {
      $q = strlen(preg_replace('/\s/', '', $regs[0]));
    if ($body[$n][0] == '>' && preg_match('/^(>+ {0,1})+/', $body[$n], $regs)) {
      $q        = substr_count($regs[0], '>');
      $body[$n] = substr($body[$n], strlen($regs[0]));

      if ($q > $quote_level) {