瀏覽代碼

Adds support for reCAPTCHA. Adds gender field. Changed layout.

Alan Lam 8 年之前
父節點
當前提交
17947b0346
共有 4 個文件被更改,包括 53 次插入 和 30 次删除
  1. 2 0
      controllers/register.php
  2. 20 0
      engine/form.php
  3. 1 0
      views/header.php
  4. 30 30
      views/register.php

+ 2 - 0
controllers/register.php

@@ -28,12 +28,14 @@ try {
 		$user->title = http::value("title", "trim");
 		$user->first_name = http::value("first_name", "trim");
 		$user->last_name = http::value("last_name", "trim");
+		$user->gender = http::value("gender", "trim");
 		$user->date_of_birth = http::value("date_of_birth", "trim");
 		$user->phone = http::value("phone", "trim");
 		$user->dts_registered = gmdate("Y-m-d H:i:s");
 
 		$user_address->postal_code = http::value("postal_code");
 
+		if(!Form::checkRecaptcha()) $form_exception->addError("reCAPTCHA check failed.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");

+ 20 - 0
engine/form.php

@@ -2,6 +2,26 @@
 
 class Form {
 
+	public static function checkRecaptcha() {
+
+		if(!defined("GOOGLE_RECAPTCHA_SECRET_KEY")) return true;
+
+		$json = http::post("https://www.google.com/recaptcha/api/siteverify", [
+			"secret" => GOOGLE_RECAPTCHA_SECRET_KEY,
+			"response" => http::value("g-recaptcha-response"),
+			"remoteip" => $_SERVER["REMOTE_ADDR"]
+		]);
+
+		if($json) {
+			$response = json_decode($json);
+			if($response) {
+				return $response->success;
+			}
+		}
+
+		return false;
+	}
+
 	public static function renderYearOptions($min = null, $max = null, $selected_value = null) {
 
 		if(empty($min)) $min = date("Y") - 100;

+ 1 - 0
views/header.php

@@ -9,6 +9,7 @@
 		<link rel="stylesheet" href="/css/bootstrap.min.css?<?=filemtime("public/css/bootstrap.min.css")?>" />
 		<link rel="icon" href="/img/icon.png?<?=filemtime("public/img/icon.png")?>" />
 		<script type="text/javascript" src="/js/fontawesome-all.min.js"></script>
+		<script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
 	</head>
 	<body>
 

+ 30 - 30
views/register.php

@@ -3,18 +3,20 @@
 
 	<p>Become a tester and earn £10 per test which should last no longer than 6 minutes!</p>
 
-	<p>If you want more information on our security policy, please call Greg on 0333 577 8989 (national call rate) or 07939 699 636.</p>
+	<p>If you want more information on our security policy, please call us on 0333 577 8989 (national call rate).</p>
 
 	<hr />
 
 	<form method="post">
+
 		<div class="row">
-			<div class="col-xl-6 mb-1">
-				<div class="row">
+			<div class="col-lg-8 col-xl-6 offset-lg-2 offset-xl-3">
+
+				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label" for="title">Title</label>
 					<div class="col-sm">
 						<select class="form-control" name="title" id="title" required>
-							<option value="">Select Title</option>
+							<option value="">Select title</option>
 							<?php
 							foreach(User::TITLES as $title) {
 								$selected = ($user->title == $title) ? "selected" : "";
@@ -26,80 +28,78 @@
 						</select>
 					</div>
 				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-xl mb-1">
-				<div class="row">
+				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="first-name">First Name</label>
 					<div class="col-sm">
 						<input class="form-control" type="text" name="first_name" id="first-name" placeholder="Enter first name" value="<?=htmlspecialchars($user->first_name)?>" required />
 					</div>
 				</div>
-			</div>
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="last-name">Last Name</label>
 					<div class="col-sm">
 						<input class="form-control" type="text" name="last_name" id="last-name" placeholder="Enter last name" value="<?=htmlspecialchars($user->last_name)?>" required />
 					</div>
 				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-xl">
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label"  for="gender">Gender</label>
+					<div class="col-sm">
+						<select class="form-control" name="gender" id="gender" required>
+							<option value="">Select gender</option>
+							<?php
+							foreach(User::GENDERS as $gender) {
+								$display = $gender;
+								$value = substr($gender, 0, 1);
+								$selected = ($user->gender == $value) ? "selected" : "";
+								?>
+								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+								<?php
+							}
+							?>
+						</select>
+					</div>
+				</div>
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="email">Email Address</label>
 					<div class="col-sm">
 						<input class="form-control" type="email" name="email" id="email" value="" placeholder="Enter email address" value="<?=htmlspecialchars($user->email)?>" required />
 					</div>
 				</div>
-			</div>
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="phone">Mobile Number</label>
 					<div class="col-sm">
 						<input class="form-control" type="phone" name="phone" id="phone" value="" placeholder="Enter mobile number" value="<?=htmlspecialchars($user->phone)?>" required />
 					</div>
 				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="password">Password</label>
 					<div class="col-sm">
 						<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" required />
 					</div>
 				</div>
-			</div>
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="password-confirm">Confirm Password</label>
 					<div class="col-sm">
 						<input class="form-control" type="password" name="password_confirm" id="password-confirm" placeholder="Confirm password" required />
 					</div>
 				</div>
-			</div>
-		</div>
-		<div class="row mb-3">
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="date-of-birth">Date of Birth</label>
 					<div class="col-sm">
 						<input class="form-control" type="date" name="date_of_birth" id="date-of-birth" placeholder="YYYY-MM-DD" value="<?=htmlspecialchars($user->date_of_birth)?>" required />
 					</div>
 				</div>
-			</div>
-			<div class="col-xl">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="postal-code">Postal Code</label>
 					<div class="col-sm">
 						<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($user_address->postal_code)?>" required />
 					</div>
 				</div>
+
+				<div class="g-recaptcha my-3" data-sitekey="<?=GOOGLE_RECAPTCHA_SITE_KEY?>"></div>
+
+				<button class="btn btn-primary" type="submit" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>">Register</button>
+
 			</div>
 		</div>
-		<button class="btn btn-primary" type="submit" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>">Register</button>
 	</form>
 </div>