From b6a06d74a9f74cb06a64cac603c5e55461f8ae65 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 21 May 2014 23:49:27 +0400 Subject: [PATCH] Fix infinite loop with sign me Added data-cfasync="false" for CloudFlare Rocketscript --- package.json | 2 +- plugins/recaptcha/recaptchalib.php | 12 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 68 +- .../libraries/RainLoop/Plugins/Manager.php | 1338 ++++++++--------- .../app/libraries/RainLoop/ServiceActions.php | 20 +- .../v/0.0.0/app/libraries/RainLoop/Social.php | 16 +- .../v/0.0.0/app/libraries/RainLoop/Utils.php | 14 +- rainloop/v/0.0.0/app/templates/Index.html | 26 +- rainloop/v/0.0.0/static/css/app.css | 18 +- rainloop/v/0.0.0/static/favicon.ico | Bin 0 -> 1150 bytes rainloop/v/0.0.0/static/js/admin.min.js | 8 +- rainloop/v/0.0.0/static/js/app.min.js | 16 +- 12 files changed, 787 insertions(+), 751 deletions(-) create mode 100644 rainloop/v/0.0.0/static/favicon.ico diff --git a/package.json b/package.json index 40cd215c7..88fc0f156 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.6.6", - "release": "929", + "release": "930", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "Gruntfile.js", diff --git a/plugins/recaptcha/recaptchalib.php b/plugins/recaptcha/recaptchalib.php index 6941df6a0..337fbc795 100644 --- a/plugins/recaptcha/recaptchalib.php +++ b/plugins/recaptcha/recaptchalib.php @@ -108,7 +108,7 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) if ($pubkey == null || $pubkey == '') { die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); } - + if ($use_ssl) { $server = RECAPTCHA_API_SECURE_SERVER; } else { @@ -119,7 +119,7 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) if ($error) { $errorpart = "&error=" . $error; } - return ' + return '