mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-01 21:49:21 +03:00
Updated: ckeditor 4.5.3, jquery 1.11.3, openpgpjs 1.2.0
OpenPGP decrypt fix + Small fixes
This commit is contained in:
parent
4deb083d7d
commit
87887373c1
370 changed files with 10805 additions and 5637 deletions
|
|
@ -1 +1 @@
|
|||
2.0
|
||||
2.1
|
||||
|
|
@ -13,9 +13,6 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
|
|||
|
||||
$this->addHook('ajax.action-pre-call', 'AjaxActionPreCall');
|
||||
$this->addHook('filter.ajax-response', 'FilterAjaxResponse');
|
||||
|
||||
$this->addTemplate('templates/PluginLoginReCaptchaGroup.html');
|
||||
$this->addTemplateHook('Login', 'BottomControlGroup', 'PluginLoginReCaptchaGroup');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -120,7 +117,7 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
|
|||
{
|
||||
$oCacher = $this->Manager()->Actions()->Cacher();
|
||||
$iConfigLimit = (int) $this->Config()->Get('plugin', 'error_limit', 0);
|
||||
|
||||
|
||||
$sKey = $this->getCaptchaCacherKey();
|
||||
|
||||
if (0 < $iConfigLimit && $oCacher && $oCacher->IsInited())
|
||||
|
|
|
|||
|
|
@ -13,10 +13,17 @@
|
|||
{
|
||||
if (null === nId)
|
||||
{
|
||||
var oEl = $('#recaptcha-div');
|
||||
if (oEl && oEl[0])
|
||||
var
|
||||
oEl = null,
|
||||
oLink = $('.plugin-mark-Login-BottomControlGroup')
|
||||
;
|
||||
|
||||
if (oLink && oLink[0])
|
||||
{
|
||||
oEl.show();
|
||||
oEl = $('<div class="controls"></div>');
|
||||
|
||||
$(oLink[0]).after(oEl);
|
||||
|
||||
nId = window.grecaptcha.render(oEl[0], {
|
||||
'sitekey': window.rl.pluginSettingsGet('recaptcha', 'public_key'),
|
||||
'theme': window.rl.pluginSettingsGet('recaptcha', 'theme')
|
||||
|
|
@ -79,7 +86,6 @@
|
|||
{
|
||||
StartRecaptcha();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<div class="controls" id="recaptcha-div" style="display: none"></div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue