From 1cf5e32bfd56c0704ca9857e5574ddd0f5edd42c Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Wed, 9 Mar 2011 05:28:29 -0500 Subject: [PATCH] Captcha aligned right, & separated note init logic --- includes/style.css | 12 ++++++ index.php | 97 +++++++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 45 deletions(-) diff --git a/includes/style.css b/includes/style.css index e7c97e0..997dfb8 100644 --- a/includes/style.css +++ b/includes/style.css @@ -5,6 +5,7 @@ h3 { margin-top:15px; + font-family:sans-serif; } a { @@ -194,4 +195,15 @@ pre { color:blue; cursor:pointer; font-size:120%; + font-weight:bold; +} + +#recaptcha_widget { + position:relative; +} + +#recaptcha_image { + position:absolute; + top:0px; + right:0px; } diff --git a/index.php b/index.php index 5bf04d6..f15b999 100644 --- a/index.php +++ b/index.php @@ -296,26 +296,44 @@ class note extends cms { private $id; private $comments_enabled = false; - private $url; + public $url; + public $title; + public $year_posted; + public $month_posted; + public $day_posted; + public $text; + public $number_of_comments; 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)-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]; } public function display() { @@ -355,24 +373,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 +383,11 @@ class note extends cms {

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

@@ -387,14 +395,17 @@ END_OF_NAVIGATION; } private function display_comment_link() { - // somehow I should be checking if there are any first, - // change to 'comment?' + 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 "comments"; + echo "$anchor_text"; } private function display_comments() { @@ -414,7 +425,7 @@ END_OF_NAVIGATION;

END_OF_COMMENT; - } + } echo "
"; } @@ -434,26 +445,22 @@ END_CAPTCHA_STYLE; echo <<
-

comment:


-
-

name:


-
-

email:


+

comment:

+ +

name:

+ +

email:


-
-
Incorrect please try again
- enter the words above: - enter the numbers you hear: -
+

what's this say?

+

enter the numbers you hear:

+(another/audio/Get an image CAPTCHAhelp)

-
another CAPTCHA?
-
audio CAPTCHA?
-
Get an image CAPTCHA
-
help?
-
+

+
+



FORM; echo recaptcha_get_html($this->recaptcha_publickey); -- 2.30.2