manos/WWW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed merge conflicts

Browse Source
This commit is contained in:
Manos Katsomallos 2017-10-30 16:20:53 +01:00
commit 9d23816483
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/sendEmail.php
View File

@ -9,9 +9,9 @@ if($_POST) {
$email = trim(stripslashes($_POST['contactEmail'])); $email = trim(stripslashes($_POST['contactEmail']));
$subject = trim(stripslashes($_POST['contactSubject'])); $subject = trim(stripslashes($_POST['contactSubject']));
$contact_message = trim(stripslashes($_POST['contactMessage'])); $contact_message = trim(stripslashes($_POST['contactMessage']));
if(isset($_POST['contactCaptcha'])){ // if(isset($_POST['contactCaptcha'])){
$captcha = $_POST['contactCaptcha']; // $captcha = $_POST['contactCaptcha'];
} // }
// Check Name // Check Name
if (strlen($name) < 2) { if (strlen($name) < 2) {
@ -26,14 +26,14 @@ if($_POST) {
$error['message'] = "Please enter your message. It should have at least 10 characters."; $error['message'] = "Please enter your message. It should have at least 10 characters.";
} }
// Captcha // Captcha
if (!$captcha){ // if (!$captcha){
$error['captcha'] = "Please check the CAPTCHA field."; // $error['captcha'] = "Please check the CAPTCHA field.";
} else { // } else {
$captchaResponse = json_decode(file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=6Le7VisUAAAAAKExpdr5NJy8AHGM0Y3iPI1eVZgD&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR']), true); $captchaResponse = json_decode(file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=6Le7VisUAAAAAKExpdr5NJy8AHGM0Y3iPI1eVZgD&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR']), true);
if($captchaResponse['success'] == false) { if($captchaResponse['success'] == false) {
$error['captcha'] = "You are a robot."; $error['captcha'] = "You are a robot.";
} // }
} // }
$mail = new PHPMailer; $mail = new PHPMailer;

8
index.html
View File

@ -392,6 +392,7 @@
<input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject"> <input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject">
<textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea> <textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea>
<button <button
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
class="g-recaptcha submit" class="g-recaptcha submit"
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt"> data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
@ -405,6 +406,13 @@
<button class="submit">Submit</button> <button class="submit">Submit</button>
>>>>>>> 4e103ad9c58ff7d1bfd9fc105e027b54373dd96b >>>>>>> 4e103ad9c58ff7d1bfd9fc105e027b54373dd96b
<span id="image-loader"> <span id="image-loader">
=======
class="g-recaptcha submit"
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
Submit
</button>
<span id="image-loader">
>>>>>>> 3f150e0b32b08b003b615ffecbc75c143c6c63f7
<img alt="" src="images/loader.gif"> <img alt="" src="images/loader.gif">
</span> </span>
</fieldset> </fieldset>