Alan Lam 7 лет назад
Родитель
Сommit
d7165440c6
5 измененных файлов с 59 добавлено и 12 удалено
  1. 1 0
      config.template.php
  2. 10 8
      engine/form.php
  3. 17 2
      views/contact.php
  4. 30 1
      views/footer.php
  5. 1 1
      views/header.php

+ 1 - 0
config.template.php

@@ -30,6 +30,7 @@ define("EMAIL_CONTACT", "contact@" . EMAIL_DOMAIN);
 define("EMAIL_TEST_RESULT", false);
 define("EMAIL_TEST_RESULT_COPY", false);
 
+define("GOOGLE_RECAPTCHA_VERSION", 2);
 define("GOOGLE_RECAPTCHA_SITE_KEY", "");
 define("GOOGLE_RECAPTCHA_SECRET", "");
 

+ 10 - 8
engine/form.php

@@ -11,7 +11,7 @@ class Form {
 		return !empty($value) ? "checked" : "";
 	}
 
-	public static function checkRecaptcha() {
+	public static function checkRecaptcha($required_score = 0.5) {
 
 		if(!defined("GOOGLE_RECAPTCHA_SECRET")) return true;
 
@@ -20,15 +20,17 @@ class Form {
 			"response" => http::value("g-recaptcha-response"),
 			"remoteip" => $_SERVER["REMOTE_ADDR"]
 		]);
+		if(!$json) return false;
 
-		if($json) {
-			$response = json_decode($json);
-			if($response) {
-				return $response->success;
-			}
-		}
+		$response = json_decode($json);
+		if(!$response) return false;
 
-		return false;
+		if(isset($response->score)) {
+			return $response->score >= $required_score;
+		}
+		else {
+			return $response->success;
+		}
 	}
 
 	public static function renderYearOptions($min = null, $max = null, $selected_value = null) {

+ 17 - 2
views/contact.php

@@ -16,7 +16,7 @@
 		</div>
 		<div class="col-lg-8">
 			<h2>Contact Form</h2>
-			<form method="post">
+			<form method="post" data-recaptcha-form>
 				<div class="row">
 					<div class="col-md">
 						<div class="form-group">
@@ -41,8 +41,23 @@
 
 				<?php
 				if(GOOGLE_RECAPTCHA_SITE_KEY) {
+					if(GOOGLE_RECAPTCHA_VERSION == 2) {
+						?>
+						<div class="g-recaptcha my-3" data-sitekey="<?=GOOGLE_RECAPTCHA_SITE_KEY?>"></div>
+						<?php
+					}
+					if(GOOGLE_RECAPTCHA_VERSION == 3) {
+						?>
+						<div class="mb-3 text-muted">
+							<small>
+								This site is protected by reCAPTCHA and the Google
+								<a href="https://policies.google.com/privacy">Privacy Policy</a> and
+								<a href="https://policies.google.com/terms">Terms of Service</a> apply.
+							</small>
+						</div>
+						<?php
+					}
 					?>
-					<div class="g-recaptcha my-3" data-sitekey="<?=GOOGLE_RECAPTCHA_SITE_KEY?>"></div>
 					<?php
 				}
 				?>

+ 30 - 1
views/footer.php

@@ -71,6 +71,35 @@
 		?>
 
 		<script src="https://maps.googleapis.com/maps/api/js?key=<?=GOOGLE_MAPS_API_KEY?>&amp;libraries=places&amp;callback=initialiseMaps" async defer></script>
-		<!--<script src="https://www.google.com/recaptcha/api.js" async defer></script>-->
+
+		<?php
+		if(GOOGLE_RECAPTCHA_SITE_KEY) {
+			$url = "https://www.google.com/recaptcha/api.js";
+			if(GOOGLE_RECAPTCHA_VERSION == 3) {
+				$url .= "?render=" . GOOGLE_RECAPTCHA_SITE_KEY;
+			}
+			?>
+			<script type="text/javascript" src="<?=htmlspecialchars($url)?>"></script>
+
+			<?php
+			if(GOOGLE_RECAPTCHA_VERSION == 3) {
+				?>
+				<script>
+				grecaptcha.ready(function() {
+					grecaptcha.execute('<?=GOOGLE_RECAPTCHA_SITE_KEY?>', {action: '<?=htmlspecialchars(Core::$controller)?>'})
+					.then(function(token) {
+						$(function() {
+							$("form[data-recaptcha-form]").each(function() {
+								$(this).append('<input type="hidden" name="g-recaptcha-response" value="' + token + '" />');
+							});
+						});
+					});
+				});
+				</script>
+				<?php
+			}
+		}
+		?>
+
 	</body>
 </html>

+ 1 - 1
views/header.php

@@ -35,7 +35,7 @@ if($print) $body_class = "print";
 		<link rel="stylesheet" href="/css/bootstrap.min.css?<?=filemtime("public/css/bootstrap.min.css")?>" />
 		<link rel="icon" href="<?=$icon?>?<?=filemtime("public" . $icon)?>" />
 		<script type="text/javascript" src="/js/fontawesome-all.min.js?<?=filemtime("public/js/fontawesome-all.min.js")?>"></script>
-		<script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
+
 		<?php
 		if(GOOGLE_ANALYTICS_ID) {
 			?>