X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=56b216aa9662175963849d9a22da89950c9fe611;hb=9412c7a558398a5a990691eb74cc61ae24d85031;hp=f15b9999abebbea79042c08f43d9a6969f6c8737;hpb=1cf5e32bfd56c0704ca9857e5574ddd0f5edd42c;p=dylansserver.git
diff --git a/index.php b/index.php
index f15b999..56b216a 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,10 @@ abstract class cms {
return 'index';
} else if (isset($_GET['project'])) {
return 'project';
+ } else if (isset($_GET['challenge'])) {
+ return 'captcha';
}
+
}
public function query() {
@@ -55,7 +58,7 @@ abstract class cms {
call_user_func_array("mysqli_stmt_bind_result", $fields);
$i = 0;
while ($statement->fetch()) {
- foreach ($row as $key1=>$value1) $return[$i][$key1] = $value1;
+ foreach ($row as $key=>$value) $return[$i][$key] = $value;
$i++;
}
$statement->free_result();
@@ -66,8 +69,14 @@ abstract class cms {
$home_link = "/") {
$scripts = "";
$stylesheets = "";
- if (cms::determine_type() == "index") { $scripts = "";
+ $scripts .= "";
+ $scripts .= "";
+ $scripts .= "";
}
echo <<db->query($sql);
$result = $result->fetch_array();
$this->number_of_comments = $result[0];
+ if (isset($_GET['verify'])) {
+ $this->verify();
+ }
}
public function display() {
@@ -348,23 +361,27 @@ class note extends cms {
}
private function verify() {
- require_once('includes/recaptchalib.php');
- echo "
";
- $resp = recaptcha_check_answer ($this->recaptcha_privatekey,
- $_SERVER["REMOTE_ADDR"],
- $_POST["recaptcha_challenge_field"],
- $_POST["recaptcha_response_field"]);
- if (!$resp->is_valid) {
- echo "sorry, reCAPTCHA said you're not human.
";
- } else {
+ if (!isset($_POST['captcha'])) {
+ require_once('includes/recaptchalib.php');
+ echo "
";
+ $resp = recaptcha_check_answer ($this->recaptcha_privatekey,
+ $_SERVER["REMOTE_ADDR"],
+ $_POST["recaptcha_challenge_field"],
+ $_POST["recaptcha_response_field"]);
+ if (!$resp->is_valid) {
+ $this->failed_captcha = true;
+ }
+ }
+ if (isset($_POST['captcha']) || $resp->is_valid) {
$sql = ("INSERT INTO comments (date_posted, author,
email, text, note)
VALUES(NOW(), ?, ?, ?, ?)");
$stmt = $this->db->prepare($sql);
// Checks are needed here (no blank text,
// and a default author / email need to be set
+ // for no-javascript users.
$stmt->bind_param('ssss',
- htmlspecialchars($_POST['author']),
+ htmlspecialchars($_POST['name']),
htmlspecialchars($_POST['email']),
htmlspecialchars($_POST['text']),
$this->id);
@@ -430,48 +447,59 @@ END_OF_COMMENT;
}
private function display_comment_form() {
+ $publickey = $this->recaptcha_publickey;
echo <<
-var RecaptchaOptions = {
- theme : 'custom',
- custom_theme_widget: 'recaptcha_widget'
- };
+Recaptcha.create("$publickey",
+ "recaptcha_div",
+ {
+ theme : 'custom',
+ custom_theme_widget: 'recaptcha_widget',
+ callback: Recaptcha.focus_response_field
+ });
END_CAPTCHA_STYLE;
require_once('includes/recaptchalib.php');
- // Trailing slash is necessary for reloads to work
$url = $this->url . "verify";
- echo "
+
END_OF_FORM;
+ } else {
+ echo <<
+
+
+END_OF_FORM;
+ }
}
}
@@ -570,6 +598,19 @@ class notFound extends Exception {
}
}
+class captcha extends cms {
+ public function display() {
+ $challenge = $_GET['challenge'];
+ $response = $_GET['response'];
+ $remoteip = $_SERVER['REMOTE_ADDR'];
+ $curl = curl_init('http://api-verify.recaptcha.net/verify?');
+ curl_setopt ($curl, CURLOPT_POST, 4);
+ curl_setopt ($curl, CURLOPT_POSTFIELDS, "privatekey=$this->recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response");
+ $result = curl_exec ($curl);
+ curl_close ($curl);
+ }
+}
+
## now actually do something:
switch (cms::determine_type()) {
case "index":
@@ -596,6 +637,10 @@ switch (cms::determine_type()) {
$archive = new archive;
$archive->display();
break;
+ case "captcha":
+ $captcha = new captcha;
+ $captcha->display();
+ break;
}
?>