X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=55986790efb50816b95c9912f18cd767a11a46a2;hb=c30849c73508b5a0168b6559b9935115186a20c7;hp=e743a3897ac6d06e471cf459b41beef527beff4d;hpb=8a98916cf3e32d836493c4f1800aea0b25d7b63f;p=dylansserver.git diff --git a/index.php b/index.php index e743a38..5598679 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 <<check_exists(); $this->comments_enabled = $comments_enabled; $url = htmlspecialchars($_SERVER['REQUEST_URI']); if (isset($_GET['verify'])) { - $url = substr($url, 0, (strlen($url)-7)); + $url = substr($url, 0, (strlen($url)-6)); } $this->url = $url; - } - - private function check_exists() { - $sql = "SELECT COUNT(*) FROM notes - WHERE url = ?"; - $results = $this->query($sql, "s", $_GET['note']); - if ($results[0]["COUNT(*)"] != 1) { + $sql = "SELECT title, date_posted, text, id + FROM notes WHERE url = ?"; + $result = $this->query($sql, "s", + $_GET['note']); + if ($result) { + $entry = $result[0]; + $this->id = $entry["id"]; + $this->title = $entry["title"]; + $date_posted = explode("-", $entry["date_posted"]); + $this->year_posted = $date_posted[0]; + $this->month_posted = $date_posted[1]; + $datetime_posted = explode(' ', $date_posted[2]); + $this->day_posted = $datetime_posted[0]; + $this->text = $entry["text"]; + } else { throw new notFound(); } + $sql = "SELECT COUNT(*) FROM comments + WHERE note = $this->id"; + $result = $this->db->query($sql); + $result = $result->fetch_array(); + $this->number_of_comments = $result[0]; + if (isset($_GET['verify'])) { + $this->verify(); + } } public function display() { @@ -330,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); @@ -355,24 +390,9 @@ class note extends cms { } private function display_note() { - $sql = "SELECT title, date_posted, text, id - FROM notes WHERE url = ?"; - $result = $this->query($sql, "s", - $_GET['note']); - $entry = $result[0]; - $this->id = $entry["id"]; // This is needed for display_comments() - $title = $entry["title"]; - $date_posted = explode("-", $entry["date_posted"]); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $datetime_posted = explode(' ', $date_posted[2]); - $day_posted = $datetime_posted[0]; echo "
"; - echo "

$year_posted/$month_posted/$day_posted/$title

"; - if (!$this->comments_enabled) { - $this->display_comment_link(); - } - echo $entry['text']; + echo "

$this->year_posted/$this->month_posted/$this->day_posted/$this->title

"; + echo $this->text; } private function write_navigation() { @@ -380,6 +400,11 @@ class note extends cms {

+END_OF_NAVIGATION; + if (!$this->comments_enabled) { + $this->display_comment_link(); + } + echo <<notes/

@@ -387,10 +412,17 @@ END_OF_NAVIGATION; } private function display_comment_link() { - // somehow I should be checking if there are any first, - // change to 'comment?' - $url = $this->url . 'comments/'; - echo "comments"; + if ($this->number_of_comments > 0) { + $anchor_text = "comments ($this->number_of_comments)"; + } else { + $anchor_text = "comment?"; + } + if (substr($this->url, (strlen($this->url)-1), strlen($this->url)) == '/') { + $url = $this->url . 'comments/'; + } else { + $url = $this->url . '/comments/'; + } + echo "$anchor_text"; } private function display_comments() { @@ -404,63 +436,79 @@ END_OF_NAVIGATION; $author = $entry['author']; $email = $entry['email']; $text = htmlspecialchars($entry['text']); + if ($email == '') { + $head = "

$author

"; + } else { + $head = "

$author

"; + } echo <<$author +
+ $head $text -
-
+
END_OF_COMMENT; - } + } echo "
"; } 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 "
"; - echo << - -

comment:


-
-

name:


-
-

email:


-
- - -
-
-
Incorrect please try again
- enter the words above: - enter the numbers you hear: -
- - -
audio CAPTCHA?
-
Get an image CAPTCHA
- -
-
-FORM; - echo recaptcha_get_html($this->recaptcha_publickey); - if (isset($_GET['verify'])) { - $this->verify(); - } - echo << - - + $url = $this->url . "verify"; + echo "
"; + echo << +

comment:

+ +

name:

+ +

email:

+
+ + +
+

what's this say?

+

enter the numbers you hear:

+ + ( another / + audio / + Get an image CAPTCHAhelp ) + +

+ +

+
+
+
+



+
+END_OF_FORM; + echo recaptcha_get_html($this->recaptcha_publickey); + if ($this->failed_captcha) { + echo <<reCAPTCHA said you're not human, + + + +END_OF_FORM; + } else { + echo << + + END_OF_FORM; + } } } @@ -559,6 +607,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": @@ -585,6 +646,10 @@ switch (cms::determine_type()) { $archive = new archive; $archive->display(); break; + case "captcha": + $captcha = new captcha; + $captcha->display(); + break; } ?>