return 'index';
} else if (isset($_GET['project'])) {
return 'project';
+ } else if (isset($_GET['challenge'])) {
+ return 'captcha';
}
+
}
public function query() {
$home_link = "/") {
$scripts = "";
$stylesheets = "<link href=\"/includes/style.css\" rel=\"stylesheet\" type=\"text/css\">";
- if ($this->determine_type() == "index") {
- $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\">";
+ if (cms::determine_type() == "index") {
+ $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\"></script>";
$home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&ucn_task=conformance#";
} else if ($this->determine_type() == 'note') {
$scripts = "<script type=\"text/javascript\" src=\"http://www.google.com/recaptcha/api/js/recaptcha_ajax.js\"></script>";
+ $scripts .= "<script type=\"text/javascript\" src=\"/includes/jquery-core.js\"></script>";
+ $scripts .= "<script type=\"text/javascript\" src=\"/includes/jquery-all-components.js\"></script>";
+ $scripts .= "<script type=\"text/javascript\" src=\"/includes/ajax.js\"></script>";
}
echo <<<END_OF_HEAD
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
<link rel="icon" href="favicon.ico" type="image/png">
$stylesheets
$scripts
-</script>
</head>
<body>
}
-class blank_page extends cms {
-
-}
class index extends cms {
public function display() {
- $this->display_head();
- $this->display_exhibits();
-
echo "<ul id=\"portfolio\" style=\"text-align:right\">";
- $this->list_projects();
- echo <<<OTHER_PROJECTS
+ $this->display_head();
+ $this->display_exhibits();
+ echo "<ul id=\"portfolio\" style=\"text-align:right\">";
+ $this->list_projects();
+ echo <<<OTHER_PROJECTS
<li>
<h3>things i've done for others:</h3>
</li>
<li>
</li>
OTHER_PROJECTS;
- // Because of the CSS necessary for the animations,
- // the contact link needs to be in #portfolio to clear
- // the floats.
- $this->display_contact();
+ // Because of the CSS necessary for the animations,
+ // the contact link needs to be in #portfolio to clear
+ // the floats.
+ echo "<li>";
+ $this->display_contact();
+ echo "</li>";
echo "</ul>";
- $this->display_close($show_contact = false);
+ $this->display_close($show_contact = false);
}
protected function display_exhibits() {
}
private function list_projects() {
- echo "<div id=\"exhibit\">";
echo <<<HEREDOC
<li>
<h3>my projects:</h3>
}
private function verify() {
- require_once('includes/recaptchalib.php');
- echo "<br>";
- $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;
- } else {
+ if (!isset($_POST['captcha'])) {
+ require_once('includes/recaptchalib.php');
+ echo "<br>";
+ $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);
}
private function display_note() {
- echo "<div id=\"note\">";
- echo "<h2><span style=\"color:grey;\">$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>";
- echo $this->text;
+ echo <<<END_OF_NOTE
+ <div id='note'>
+ <h2><span style='color:grey;'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>
+ $this->text
+ </div>
+END_OF_NOTE;
}
private function write_navigation() {
echo <<<END_OF_NAVIGATION
<br>
- <div id=\"navigation\">
+ <div id='navigation'>
<h2>
END_OF_NAVIGATION;
- if ($this->failed_captcha) {
- echo "<span style=\"color:red;border:1px solid black;padding:15px;\">sorry, reCAPTCHA said you're not human.</span><br><br><br>";
- }
if (!$this->comments_enabled) {
$this->display_comment_link();
}
echo <<<END_OF_NAVIGATION
- <a href="/notes/">notes</a>/
+ <a href="/notes/">back to notes</a>/
</h2>
</div>
END_OF_NAVIGATION;
private function display_comment_link() {
if ($this->number_of_comments > 0) {
- $anchor_text = "comments ($this->number_of_comments)";
+ $anchor_text = "comments($this->number_of_comments)/";
} else {
$anchor_text = "comment?";
}
$author = $entry['author'];
$email = $entry['email'];
$text = htmlspecialchars($entry['text']);
+ if ($email == '') {
+ $head = "<h3>$author</h3>";
+ } else {
+ $head = "<h3><a href='mailto:$email'>$author</a></h3>";
+ }
echo <<<END_OF_COMMENT
- <h3><a href="mailto:$email">$author</a></h3>
+ <div class='comment'>
+ $head
$text
- <br>
- <br>
+ </div>
END_OF_COMMENT;
}
echo "</div>";
$publickey = $this->recaptcha_publickey;
echo <<<END_CAPTCHA_STYLE
<script type="text/javascript">
-function showRecaptcha(element) {
Recaptcha.create("$publickey",
"recaptcha_div",
{
custom_theme_widget: 'recaptcha_widget',
callback: Recaptcha.focus_response_field
});
-}
</script>
END_CAPTCHA_STYLE;
require_once('includes/recaptchalib.php');
- // Trailing slash is necessary for reloads to work
$url = $this->url . "verify";
- echo "<form method=\"post\" action=\"$url\">";
- echo <<<END_OF_FORM
-<div id="comment">
-<input type="button" value="comment" onclick="showRecaptcha('recaptcha_div');"></input>
-
-<div id="recaptcha_div">
-<br>
-<h3>comment:</h3>
-<textarea rows="10" cols="70" name=text></textarea>
-<h3>name:</h3>
-<input type=text name=author>
-<h3>email:</h3>
-<input type=text name=email><br>
-<nowiki>
-
-<div id="recaptcha_widget">
-<h3 class="recaptcha_only_if_image"><b>what's this say</b>?</h3>
-<h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3><span style="font-size:80%;">(<a href="javascript:Recaptcha.reload()">another</a>/<span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span>/<span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">Get an image CAPTCHA</a></span><a href="javascript:Recaptcha.showhelp()">help</a>)</span><br><br>
- <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
-<br><br>
-<div style="float:right;position:relative;width:100px;"><div id="recaptcha_image"></div></div>
-<br><br><br><br>
-</div>
-</div>
-
-<input class="submit" type="submit" value="comment">
-</form>
-</div>
+ echo "<form id=\"comment_form\" method=\"post\" action=\"$url\">";
+ echo <<<END_OF_FORM
+ <div id="comment">
+ <h3>comment:</h3>
+ <textarea rows="10" cols="70" name="text" id="comment_text"></textarea>
+ <h3>name:</h3>
+ <input type=text name="name" id="comment_name">
+ <h3>email:</h3>
+ <input type=text name="email" id="comment_email"><br>
+
+ <nowiki>
+ <div id="recaptcha_widget">
+ <h3 class="recaptcha_only_if_image"><b>what's this say</b>?</h3>
+ <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
+ <span style="font-size:80%;">
+ ( <a href="javascript:Recaptcha.reload()">another</a> /
+ <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span> /
+ <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">Get an image CAPTCHA</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
+ </span>
+ <br><br>
+ <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
+ <br><br>
+ <div style="float:right;position:relative;width:100px;">
+ <div id="recaptcha_image"></div>
+ </div>
+ <br><br><br><br>
+ </div>
+END_OF_FORM;
+ echo recaptcha_get_html($this->recaptcha_publickey);
+ if ($this->failed_captcha) {
+ echo <<<END_OF_FORM
+ <span style='font-weight:bold;font-family:sans-serif;color:red;margin-top:15px;'>reCAPTCHA said you're not human,</span>
+ <input id="submit" class="submit" type="submit" value="try again?">
+ </form>
+ </div>
+END_OF_FORM;
+ } else {
+ echo <<<END_OF_FORM
+ <input id="submit" class="submit" type="submit" value="post comment">
+ </form>
+ </div>
END_OF_FORM;
+ }
}
}
}
}
+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":
$archive = new archive;
$archive->display();
break;
+ case "captcha":
+ $captcha = new captcha;
+ $captcha->display();
+ break;
}
?>
disinclined.org / git / dylansserver.git / blobdiff