From 971f464f90f6a754ebb5c8dca74fe31bd36928a3 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Wed, 2 Oct 2019 20:31:18 +1300 Subject: [PATCH] improve cardigann's need-cookie-for-recaptcha checking. resolves #5963 --- src/Jackett.Common/Indexers/CardigannIndexer.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index a0304d824..f6dcb6a36 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -788,9 +788,17 @@ namespace Jackett.Common.Indexers var hasCaptcha = false; - var CloudFlareCaptchaChallenge = landingResultDocument.QuerySelector("script[src*=\"/recaptcha/api.js\"]"); + var cloudFlareCaptchaScript = landingResultDocument.QuerySelector("script[src*=\"/recaptcha/api.js\"]"); + var cloudFlareCaptchaGroup = landingResultDocument.QuerySelector("#recaptca_group"); + var cloudFlareCaptchaDisplay = true; + if (cloudFlareCaptchaGroup != null) + { + var cloudFlareCaptchaGroupStyle = cloudFlareCaptchaGroup.GetAttribute("style"); + if (cloudFlareCaptchaGroupStyle != null) + cloudFlareCaptchaDisplay = !cloudFlareCaptchaGroupStyle.Contains("display:none;"); + } var grecaptcha = landingResultDocument.QuerySelector(".g-recaptcha"); - if (CloudFlareCaptchaChallenge != null && grecaptcha != null) + if (cloudFlareCaptchaScript != null && grecaptcha != null && cloudFlareCaptchaDisplay) { hasCaptcha = true; var CaptchaItem = new RecaptchaItem();