abstract class cms {
private $config_file = '/etc/dylanstestserver.ini';
protected $db;
+ protected $recaptcha_publickey;
+ protected $recaptcha_privatekey;
public function __construct() {
- $config = parse_ini_file($this->config_file);
+ $config = parse_ini_file($this->config_file, true);
$this->db = new mysqli(
- $config['domain'],
- $config['user'],
- $config['password'],
- $config['database']);
+ $config[database]['domain'],
+ $config[database]['user'],
+ $config[database]['password'],
+ $config[database]['database']);
if (mysqli_connect_errno()) {
echo "Problem connecting to database: ";
echo mysqli_connect_error();
exit();
}
+ $this->recaptcha_publickey = $config[recaptcha]['publickey'];
+ $this->recaptcha_privatekey = $config[recaptcha]['privatekey'];
ob_start();
}
$home_link = "/") {
$scripts = "";
$stylesheets = "<link href=\"/includes/style.css\" rel=\"stylesheet\" type=\"text/css\">";
- if (cms::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\">";
$home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&ucn_task=conformance#";
}
echo <<<END_OF_HEAD
}
+class blank_page extends cms {
+
+}
+
class index extends cms {
public function display() {
$this->display_head();
class note extends cms {
- public function __construct() {
+ private $id;
+ private $comments_enabled = false;
+ private $url;
+
+ public function __construct($comments_enabled = false) {
parent::__construct();
$this->check_exists();
+ $this->comments_enabled = $comments_enabled;
+ $url = htmlspecialchars($_SERVER['REQUEST_URI']);
+ if (isset($_GET['verify'])) {
+ $url = substr($url, 0, (strlen($url)-7));
+ }
+ $this->url = $url;
}
private function check_exists() {
public function display() {
$this->display_head();
- $sql = "SELECT title, date_posted, text
+ $this->display_note();
+ if ($this->comments_enabled) {
+ $this->display_comments();
+ $this->display_comment_form();
+ }
+ $this->write_navigation();
+ $this->display_close();
+ }
+
+ 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) {
+ echo "<span style=\"color:red;border:1px solid black;padding:15px;\">sorry, reCAPTCHA said you're not human.</span><br><br><br>";
+ } else {
+ $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
+ $stmt->bind_param('ssss',
+ htmlspecialchars($_POST['author']),
+ htmlspecialchars($_POST['email']),
+ htmlspecialchars($_POST['text']),
+ $this->id);
+ $stmt->execute();
+ }
+ }
+
+ 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];
$day_posted = $datetime_posted[0];
echo "<div id=\"note\">";
echo "<h2><span style=\"color:grey;\">$year_posted/$month_posted/$day_posted/</span>$title</h2>";
+ if (!$this->comments_enabled) {
+ $this->display_comment_link();
+ }
echo $entry['text'];
- $this->write_navigation();
- $this->display_close();
}
private function write_navigation() {
- echo "<br>";
- echo "<div id=\"navigation\">";
- echo "<h2>";
- echo "<a href=\"/notes/\">notes</a>/";
- echo "</h2>";
- echo "</div>";
+ echo <<<END_OF_NAVIGATION
+ <br>
+ <div id=\"navigation\">
+ <h2>
+ <a href=\"/notes/\">notes</a>/
+ </h2>
+ </div>
+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 "<a id=\"comment_link\" href=\"$url\">comments</a>";
+ }
+
+ private function display_comments() {
+ echo "<div id=\"comments\">";
+ $sql= "SELECT date_posted, author, email, text
+ FROM comments WHERE note = ?
+ ORDER BY date_posted DESC";
+ $result = $this->query($sql, "d", $this->id);
+ foreach ($result as $row => $entry) {
+ $date_posted = $entry['date_posted'];
+ $author = $entry['author'];
+ $email = $entry['email'];
+ $text = htmlspecialchars($entry['text']);
+ echo <<<END_OF_COMMENT
+ <h3><a href="mailto:$email">$author</a></h3>
+ $text
+ <br>
+ <br>
+END_OF_COMMENT;
+ }
+ echo "</div>";
+ }
+
+ private function display_comment_form() {
+ echo <<<END_CAPTCHA_STYLE
+<script type="text/javascript">
+var RecaptchaOptions = {
+ theme : 'custom',
+ custom_theme_widget: 'recaptcha_widget'
+ };
+</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 <<<FORM
+ <div id="comment">
+
+<h3>comment:</h3><br>
+<textarea rows="10" cols="70" name=text></textarea><br>
+<h3>name:</h3><br>
+<input type=text name=author><br>
+<h3>email:</h3><br>
+<input type=text name=email><br>
+<nowiki>
+
+<div id="recaptcha_widget">
+ <div id="recaptcha_image"></div>
+ <div class="recaptcha_only_if_incorrect_sol" style="color:red">Incorrect please try again</div>
+ <span class="recaptcha_only_if_image"><b>enter the words above</b>:</span>
+ <span class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</span>
+ <br>
+ <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
+ <div><a href="javascript:Recaptcha.reload()"><small>another CAPTCHA?</small></a></div>
+ <div class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')"><small>audio CAPTCHA?</small></a></div>
+ <div class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')"><small>Get an image CAPTCHA</small></a></div>
+ <div><a href="javascript:Recaptcha.showhelp()"><small>help?</small></a></div>
+ <br>
+</div>
+FORM;
+ echo recaptcha_get_html($this->recaptcha_publickey);
+ if (isset($_GET['verify'])) {
+ $this->verify();
+ }
+ echo <<<END_OF_FORM
+ <input class="submit" type="submit" value="comment">
+ </form>
+ </div>
+END_OF_FORM;
}
}
$project->display();
break;
case "note":
- $note = new note;
+ if (isset($_GET['comments'])) {
+ $note = new note($comments_enabled = true);
+ } else {
+ $note = new note;
+ }
$note->display();
break;
case "page":
disinclined.org / git / dylansserver.git / blobdiff