From 4db3a80e869ec8b8c3e0c3f8401c8df12ff5c553 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Fri, 23 Mar 2012 04:48:19 -0400 Subject: [PATCH 01/16] now using a model for note pages, but its not clean --- cms.php | 169 +++++++----------------------------------------- model/model.php | 57 ++++++++++++++++ model/note.php | 124 +++++++++++++++++++++++++++++++++++ view/note.php | 18 +++--- 4 files changed, 215 insertions(+), 153 deletions(-) create mode 100644 model/model.php create mode 100644 model/note.php diff --git a/cms.php b/cms.php index 961a1f5..a3d9c3b 100644 --- a/cms.php +++ b/cms.php @@ -1,15 +1,18 @@ model = new model(); $config = parse_ini_file($this->config_file, true); $this->db = new mysqli( $config['database']['domain'], @@ -25,25 +28,6 @@ abstract class cms { $this->recaptcha_privatekey = $config['recaptcha']['privatekey']; $this->title = $config['site']['default_title']; $this->home_link = $config['site']['home_link']; - ob_start(); - } - - public static function determine_type() { - if (isset($_GET['page']) && is_numeric($_GET['page'])) { - return 'page'; - } else if (isset($_GET['year'])) { - return 'archive'; - } else if (isset($_GET['note'])) { - return 'note'; - } else if ($_SERVER['REQUEST_URI'] == '/') { - return 'index'; - } else if (isset($_GET['project'])) { - return 'project'; - } else if (isset($_GET['rss'])) { - return 'rss'; - } else if (isset($_GET['challenge'])) { - return 'captcha'; - } } public function query() { @@ -71,6 +55,24 @@ abstract class cms { return $return; } + public static function determine_type() { + if (isset($_GET['page']) && is_numeric($_GET['page'])) { + return 'page'; + } else if (isset($_GET['year'])) { + return 'archive'; + } else if (isset($_GET['note'])) { + return 'note'; + } else if ($_SERVER['REQUEST_URI'] == '/') { + return 'index'; + } else if (isset($_GET['project'])) { + return 'project'; + } else if (isset($_GET['rss'])) { + return 'rss'; + } else if (isset($_GET['challenge'])) { + return 'captcha'; + } + } + public function init() { switch (cms::determine_type()) { case 'index': @@ -82,8 +84,9 @@ abstract class cms { $project->display(); break; case 'note': - $note = new note; - $note->display(); + require_once("model/note.php"); + $note = new note(); + require_once("view/note.php"); break; case 'page': $page = new page; @@ -219,128 +222,6 @@ END_NOTE; } -class note extends cms { - - private $id; - private $comments_enabled = false; - private $failed_captcha; - public $url; - public $title; - public $year_posted; - public $month_posted; - public $day_posted; - public $text; - public $number_of_comments; - - public function __construct() { - parent::__construct(); - if (isset($_GET['comments'])) { - $this->comments_enabled = true; - } - $url = htmlspecialchars($_SERVER['REQUEST_URI']); - if (isset($_GET['verify'])) { - $url = substr($url, 0, (strlen($url)-6)); - } - $this->url = $url; - $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() { - require_once("view/note.php"); - } - - private function verify() { - 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, - text, note) - VALUES(NOW(), ?, ?, ?)"); - $stmt = $this->db->prepare($sql); - // Checks are needed here (no blank text, - // and a default author needs to be set - // for no-javascript users. - $stmt->bind_param('sss', - $_POST['name'], - $_POST['text'], - $this->id); - $stmt->execute(); - } - } - - private function display_comment_link() { - 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() { - echo "
"; - $sql= "SELECT date_posted, author, 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']; - $text = htmlspecialchars($entry['text']); - $head = "

" . htmlspecialchars($author) . "

"; - echo "
"; - echo $head; - echo $text; - echo "
"; - } - echo "
"; - } - - private function display_comment_form() { - $publickey = $this->recaptcha_publickey; - require_once("view/comment-form.php"); - } -} - - class archive extends cms { public function __construct() { diff --git a/model/model.php b/model/model.php new file mode 100644 index 0000000..f9bb164 --- /dev/null +++ b/model/model.php @@ -0,0 +1,57 @@ +config_file, true); + $this->db = new mysqli( + $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']; + $this->title = $config['site']['default_title']; + $this->home_link = $config['site']['home_link']; + } + + public function query() { + $args = func_get_args(); + $statement = $this->db->prepare($args[0]); + $args = array_slice($args, 1); + call_user_func_array(array($statement, 'bind_param'), &$args); + $statement->execute(); + $return = array(); + $statement->store_result(); + $row = array(); + $data = $statement->result_metadata(); + $fields = array(); + $fields[0] = &$statement; + while($field = $data->fetch_field()) { + $fields[] = &$row[$field->name]; + } + call_user_func_array("mysqli_stmt_bind_result", $fields); + $i = 0; + while ($statement->fetch()) { + foreach ($row as $key=>$value) $return[$i][$key] = $value; + $i++; + } + $statement->free_result(); + return $return; + } + +} + +?> diff --git a/model/note.php b/model/note.php new file mode 100644 index 0000000..01338be --- /dev/null +++ b/model/note.php @@ -0,0 +1,124 @@ +comments_enabled = true; + } + $url = htmlspecialchars($_SERVER['REQUEST_URI']); + if (isset($_GET['verify'])) { + $url = substr($url, 0, (strlen($url)-6)); + } + $this->url = $url; + $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() { + require_once("view/note.php"); + } + + public function verify() { + 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, + text, note) + VALUES(NOW(), ?, ?, ?)"); + $stmt = $this->db->prepare($sql); + // Checks are needed here (no blank text, + // and a default author needs to be set + // for no-javascript users. + $stmt->bind_param('sss', + $_POST['name'], + $_POST['text'], + $this->id); + $stmt->execute(); + } + } + + public function display_comment_link() { + 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"; + } + + public function display_comments() { + echo "
"; + $sql= "SELECT date_posted, author, 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']; + $text = htmlspecialchars($entry['text']); + $head = "

" . htmlspecialchars($author) . "

"; + echo "
"; + echo $head; + echo $text; + echo "
"; + } + echo "
"; + } + + public function display_comment_form() { + $publickey = $this->recaptcha_publickey; + require_once("view/comment-form.php"); + } +} + +?> diff --git a/view/note.php b/view/note.php index 367b334..3174f9d 100644 --- a/view/note.php +++ b/view/note.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $note->title; ?> @@ -29,7 +29,7 @@
@@ -38,18 +38,18 @@

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

- text ?> + year_posted/$note->month_posted/$note->day_posted/" ?> + title ?> + text ?>




-- 2.30.2 From 6436af7589776b09d5a39a2a12cb8bd130915487 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Fri, 23 Mar 2012 04:52:37 -0400 Subject: [PATCH 02/16] page now using model --- cms.php | 71 +++------------------------------------------------ view/page.php | 14 +++++----- 2 files changed, 10 insertions(+), 75 deletions(-) diff --git a/cms.php b/cms.php index a3d9c3b..428cae1 100644 --- a/cms.php +++ b/cms.php @@ -89,8 +89,9 @@ abstract class cms { require_once("view/note.php"); break; case 'page': - $page = new page; - $page->display(); + require_once("model/page.php"); + $page = new page(); + require_once("view/page.php"); break; case "rss": $rss = new rss(); @@ -156,72 +157,6 @@ class project extends index { } -class page extends cms { - - private $page = 1; - private $offset = 0; - private $notes_per_page = 4; - private $number_of_pages = 1; - - public function __construct() { - parent::__construct(); - $this->page_offset(); - } - - private function page_offset() { - $sql = "SELECT COUNT(*) FROM notes"; - $result = $this->db->query($sql); - $result = $result->fetch_array(); - $this->number_of_pages = ceil($result[0] / $this->notes_per_page); - if (isset($_GET['page']) && is_numeric($_GET['page'])) { - $this->page = (int) $_GET['page']; - } else { - throw new notFound(); - } - if ($this->page > $this->number_of_pages) { - throw new notFound(); - } - if ($this->page < 1) { - throw new notFound(); - } - $this->offset = ($this->page - 1) * $this->notes_per_page; - } - - public function display() { - require_once("view/page.php"); - } - - public function display_notes() { - echo "
"; - $sql = "SELECT date_posted, title, url, text - FROM notes ORDER BY date_posted DESC - LIMIT ?, ?"; - $result = $this->query($sql, "ii", - $this->offset, - $this->notes_per_page); - foreach ($result as $row => $entry) { - $title = $entry['title']; - $url = '/note/' . $entry['url']; - $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]; - $text = $entry['text']; - echo << -

- $year_posted/$month_posted/$day_posted/$title -

- $text -
-END_NOTE; - } - echo "
"; - } -} - - class archive extends cms { public function __construct() { diff --git a/view/page.php b/view/page.php index 2829668..8bba8ac 100644 --- a/view/page.php +++ b/view/page.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $page->title; ?> @@ -29,23 +29,23 @@
- display_notes() ?> + display_notes() ?> "; + } + + public function list_projects() { + $sql = "SELECT title FROM projects ORDER BY rank"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo "
  • $entry->title
    • "; + } + } + +} + +?> diff --git a/model/page.php b/model/page.php new file mode 100644 index 0000000..fe7d0a6 --- /dev/null +++ b/model/page.php @@ -0,0 +1,68 @@ +page_offset(); + } + + private function page_offset() { + $sql = "SELECT COUNT(*) FROM notes"; + $result = $this->db->query($sql); + $result = $result->fetch_array(); + $this->number_of_pages = ceil($result[0] / $this->notes_per_page); + if (isset($_GET['page']) && is_numeric($_GET['page'])) { + $this->page = (int) $_GET['page']; + } else { + throw new notFound(); + } + if ($this->page > $this->number_of_pages) { + throw new notFound(); + } + if ($this->page < 1) { + throw new notFound(); + } + $this->offset = ($this->page - 1) * $this->notes_per_page; + } + + public function display() { + require_once("view/page.php"); + } + + public function display_notes() { + echo "
    "; + $sql = "SELECT date_posted, title, url, text + FROM notes ORDER BY date_posted DESC + LIMIT ?, ?"; + $result = $this->query($sql, "ii", + $this->offset, + $this->notes_per_page); + foreach ($result as $row => $entry) { + $title = $entry['title']; + $url = '/note/' . $entry['url']; + $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]; + $text = $entry['text']; + echo << +

    + $year_posted/$month_posted/$day_posted/$title +

    + $text +
    +END_NOTE; + } + echo "
    "; + } +} + +?> diff --git a/model/project.php b/model/project.php new file mode 100644 index 0000000..c7f780d --- /dev/null +++ b/model/project.php @@ -0,0 +1,23 @@ +"; + $sql = "SELECT text FROM projects + WHERE title = ?"; + $result = $this->query($sql, "s", $_GET['project']); + if ($result = $result[0]['text']) { + $text = str_replace("class='exhibit'", "class='exhibit' style='display:block;'", $result); + echo $text; + echo "
    "; + } else { + throw new notFound(); + } + } + +} + +?> diff --git a/model/rss.php b/model/rss.php new file mode 100644 index 0000000..b7c5164 --- /dev/null +++ b/model/rss.php @@ -0,0 +1,38 @@ +db->query("SELECT date_posted, title, text, url + FROM notes ORDER BY date_posted DESC + LIMIT 5"); + while ($entry = $result->fetch_object()) { + $title = $entry->title; + $date_posted = $entry->date_posted; + $url = "http://dylansserver.com/note/" . $entry->url; + $text = $entry->text; + $text = strip_tags($text); + $end_of_first_sentence = strpos($text, '.'); + if ($end_of_first_sentence) { + $end_of_second_sentence = strpos($text, '.', ($end_of_first_sentence + 1)); + if ($end_of_second_sentence) { + $description = substr($text, '0', ($end_of_second_sentence + 1)); + } else { + $description = substr($text, '0', ($end_of_first_sentence + 1)); + } + } + echo ""; + echo " $title"; + echo " $url"; + echo " $url"; + echo " $description"; + echo ""; + } + } +} + +?> diff --git a/view/index.php b/view/index.php index b90915e..fb2ed19 100644 --- a/view/index.php +++ b/view/index.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $this->title ?> diff --git a/view/note.php b/view/note.php index 3174f9d..367b334 100644 --- a/view/note.php +++ b/view/note.php @@ -3,7 +3,7 @@ - <?php echo $note->title; ?> + <?php echo $this->title; ?> @@ -29,7 +29,7 @@
    @@ -38,18 +38,18 @@

    - year_posted/$note->month_posted/$note->day_posted/" ?> - title ?>

    - text ?> + year_posted/$this->month_posted/$this->day_posted/" ?> + title ?> + text ?>




    diff --git a/view/page.php b/view/page.php index 8bba8ac..2829668 100644 --- a/view/page.php +++ b/view/page.php @@ -3,7 +3,7 @@ - <?php echo $page->title; ?> + <?php echo $this->title; ?> @@ -29,23 +29,23 @@
    - display_notes() ?> + display_notes() ?> "; } } diff --git a/view/page.php b/view/page.php index 2829668..72d5edd 100644 --- a/view/page.php +++ b/view/page.php @@ -35,8 +35,25 @@
    -
    - display_notes() ?> +
    +
    + notes as $note) { + echo "
    "; + echo "

    "; + echo ""; + echo $note['year_posted'] . "/"; + echo $note['month_posted'] . "/"; + echo $note['day_posted'] . "/"; + echo ""; + echo ""; + echo $note['title']; + echo ""; + echo "

    "; + echo $note['text']; + } + ?> +
    - display_exhibits() ?> +
    + exhibits as $exhibit) { + echo $exhibit; + } + ?> +

    • my projects:

      • - list_projects() ?> + projects as $project => $title) { + echo "
    • $title
      • "; + } + ?>

    • things i've done for others:

      • -- 2.30.2 From 5bcb138ac97476619e78aaa52e9f5507003d5caf Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sat, 24 Mar 2012 15:17:42 -0400 Subject: [PATCH 09/16] rss layout now fully separated m/v/c --- model/rss.php | 29 +++++++++++++---------------- view/rss.php | 11 ++++++++++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/model/rss.php b/model/rss.php index b7c5164..a169ead 100644 --- a/model/rss.php +++ b/model/rss.php @@ -2,35 +2,32 @@ class rss extends model { + public $items = array(); + public function display() { + $this->fetch_items(); require_once("view/rss.php"); } - public function display_items() { + public function fetch_items() { $result = $this->db->query("SELECT date_posted, title, text, url FROM notes ORDER BY date_posted DESC LIMIT 5"); while ($entry = $result->fetch_object()) { - $title = $entry->title; - $date_posted = $entry->date_posted; - $url = "http://dylansserver.com/note/" . $entry->url; - $text = $entry->text; - $text = strip_tags($text); - $end_of_first_sentence = strpos($text, '.'); + $entry->url = "http://dylansserver.com/note/" . $entry->url; + $entry->text = strip_tags($entry->text); + $end_of_first_sentence = strpos($entry->text, '.'); if ($end_of_first_sentence) { - $end_of_second_sentence = strpos($text, '.', ($end_of_first_sentence + 1)); + $end_of_second_sentence = strpos($entry->text, '.', ($end_of_first_sentence + 1)); if ($end_of_second_sentence) { - $description = substr($text, '0', ($end_of_second_sentence + 1)); + $entry->description = substr($entry->text, '0', ($end_of_second_sentence + 1)); } else { - $description = substr($text, '0', ($end_of_first_sentence + 1)); + $entry->description = substr($entry->text, '0', ($end_of_first_sentence + 1)); } + foreach ($entry as $key => $val) { + $this->items[][$key] = $entry->$key; + } } - echo ""; - echo " $title"; - echo " $url"; - echo " $url"; - echo " $description"; - echo ""; } } } diff --git a/view/rss.php b/view/rss.php index 2f55ca3..7d0c60c 100644 --- a/view/rss.php +++ b/view/rss.php @@ -4,6 +4,15 @@ http://dylansserver.com/notes dylansserver.com/notes/rss - display_items() ?> + items as $item) { + echo ""; + echo " " . $item['title'] . ""; + echo " " . $item['url'] . ""; + echo " " . $item['url'] . ""; + echo " " . $item['description'] . ""; + echo ""; + } + ?> -- 2.30.2 From 3ac8e530ad5b9c2f32792ac897852c7989cef2fa Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sat, 24 Mar 2012 15:40:06 -0400 Subject: [PATCH 10/16] archive now separated m/v/c --- model/archive.php | 35 ++++++++++++----------------------- view/archive.php | 34 ++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/model/archive.php b/model/archive.php index 0f805d4..d0947c4 100644 --- a/model/archive.php +++ b/model/archive.php @@ -2,6 +2,8 @@ class archive extends model { + public $notes = array(); + public function __construct() { parent::__construct(); } @@ -16,10 +18,11 @@ class archive extends model { } public function display() { + $this->fetch_notes(); require_once("view/archive.php"); } - public function display_notes() { + public function fetch_notes() { switch (true) { case (isset($_GET['year']) && !isset($_GET['month']) && !isset($_GET['day'])): @@ -50,28 +53,14 @@ class archive extends model { $_GET['day']); break; } - if (count($result) >= 1) { - echo "
      "; - foreach ($result as $row => $entry) { - $title = $entry['title']; - $url = '/note/' . $entry['url']; - $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 "

      "; - echo "$year_posted/$month_posted/$day_posted/"; - echo "$title

      "; - echo $entry['text']; - echo "
      "; - } - echo "
      "; - } else { - echo "
      "; - echo "

      sorry, nothing here

      "; - echo "
      Empty set (0.00 sec)
      "; + foreach ($result as $row => $entry) { + $entry['url'] = '/note/' . $entry['url']; + $date_posted = explode("-", $entry['date_posted']); + $entry['year_posted'] = $date_posted[0]; + $entry['month_posted'] = $date_posted[1]; + $entry['datetime_posted'] = explode(' ', $date_posted[2]); + $entry['day_posted'] = $entry['date_posted'][0]; + $this->notes[$row] = $entry; } } diff --git a/view/archive.php b/view/archive.php index 2829668..073c65f 100644 --- a/view/archive.php +++ b/view/archive.php @@ -36,20 +36,26 @@
      - display_notes() ?> - + notes) >= 1) { + foreach ($this->notes as $note) { + echo "
      "; + echo "

      "; + echo $note['year_posted'] . "/"; + echo $note['month_posted'] . "/"; + echo $note['day_posted'] . "/"; + echo ""; + echo $note['title'] . "

      "; + echo $note['text']; + echo "
      "; + } + } else { + echo "
      "; + echo "

      sorry, nothing here

      "; + echo "
      Empty set (0.00 sec)
      "; + } + ?> +

      dylan

      @psu.edu -- 2.30.2 From 86ca40f0b2234a734a277ffb6cd6388b9355d1a6 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sat, 24 Mar 2012 15:49:37 -0400 Subject: [PATCH 11/16] separated model/note.php into functions --- model/note.php | 68 ++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/model/note.php b/model/note.php index d5ab563..8e863f1 100644 --- a/model/note.php +++ b/model/note.php @@ -24,6 +24,11 @@ class note extends model { $url = substr($url, 0, (strlen($url)-6)); } $this->url = $url; + $this->fetch_note(); + $this->fetch_comments(); + } + + public function fetch_note() { $sql = "SELECT title, date_posted, text, id FROM notes WHERE url = ?"; $result = $this->query($sql, "s", @@ -41,6 +46,9 @@ class note extends model { } else { throw new notFound(); } + } + + public function fetch_comments() { $sql = "SELECT COUNT(*) FROM comments WHERE note = $this->id"; $result = $this->db->query($sql); @@ -55,34 +63,6 @@ class note extends model { require_once("view/note.php"); } - public function verify() { - 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, - text, note) - VALUES(NOW(), ?, ?, ?)"); - $stmt = $this->db->prepare($sql); - // Checks are needed here (no blank text, - // and a default author needs to be set - // for no-javascript users. - $stmt->bind_param('sss', - $_POST['name'], - $_POST['text'], - $this->id); - $stmt->execute(); - } - } - public function display_comment_link() { if ($this->number_of_comments > 0) { $anchor_text = "comments($this->number_of_comments)/"; @@ -98,7 +78,6 @@ class note extends model { } public function display_comments() { - // should be called like $note->comment[0]['author'] $sql= "SELECT date_posted, author, text FROM comments WHERE note = ? ORDER BY date_posted DESC"; @@ -110,13 +89,42 @@ class note extends model { $this->comment[$i]['text'] = htmlspecialchars($entry['text']); $this->comment[$i]['head'] = "

      " . htmlspecialchars($author) . "

      "; $i++; - } + } } public function display_comment_form() { $publickey = $this->recaptcha_publickey; require_once("view/comment-form.php"); } + + public function verify() { + 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, + text, note) + VALUES(NOW(), ?, ?, ?)"); + $stmt = $this->db->prepare($sql); + // Checks are needed here (no blank text, + // and a default author needs to be set + // for no-javascript users. + $stmt->bind_param('sss', + $_POST['name'], + $_POST['text'], + $this->id); + $stmt->execute(); + } + } + } ?> -- 2.30.2 From c8d6aa1779e2fc2c21fb2b9d856dbee810ac2fe1 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Wed, 27 Jun 2012 02:35:29 -0400 Subject: [PATCH 12/16] pass-by-reference defined in func. def. not call --- model/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/model.php b/model/model.php index f9bb164..9088831 100644 --- a/model/model.php +++ b/model/model.php @@ -31,7 +31,7 @@ class model { $args = func_get_args(); $statement = $this->db->prepare($args[0]); $args = array_slice($args, 1); - call_user_func_array(array($statement, 'bind_param'), &$args); + call_user_func_array(array($statement, 'bind_param'), $args); $statement->execute(); $return = array(); $statement->store_result(); -- 2.30.2 From 66c99d6519da8b6c2dc1eb04641ea6010789aee7 Mon Sep 17 00:00:00 2001 From: dylan Date: Sun, 16 Dec 2012 03:17:46 +0000 Subject: [PATCH 13/16] added background image & adjusted styles for it --- images/gray_jean.png | Bin 0 -> 13475 bytes includes/style.css | 4 ++++ includes/syntax/styles/shCoreDefault.css | 9 ++++++--- includes/syntax/styles/shThemeDefault.css | 4 ++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 images/gray_jean.png diff --git a/images/gray_jean.png b/images/gray_jean.png new file mode 100644 index 0000000000000000000000000000000000000000..355fba2e4014ee4e4023137382b01428247e1243 GIT binary patch literal 13475 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 DeE@Bk literal 0 HcmV?d00001 diff --git a/includes/style.css b/includes/style.css index 5329f68..8128933 100644 --- a/includes/style.css +++ b/includes/style.css @@ -25,6 +25,10 @@ margin:0; padding:0; } +body { + background-image: url('../images/gray_jean.png'); +} + h3 { margin-top:15px; font-family:MuseoSlab500; diff --git a/includes/syntax/styles/shCoreDefault.css b/includes/syntax/styles/shCoreDefault.css index 08f9e10..81f2a3b 100644 --- a/includes/syntax/styles/shCoreDefault.css +++ b/includes/syntax/styles/shCoreDefault.css @@ -92,7 +92,7 @@ width: 100% !important; height: 100% !important; border: none !important; - background: white !important; + /*background: white !important;*/ padding-left: 1em !important; overflow: hidden !important; white-space: pre !important; @@ -225,6 +225,7 @@ color: black !important; } +/* .syntaxhighlighter { background-color: white !important; } @@ -237,6 +238,8 @@ .syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { background-color: #e0e0e0 !important; } +*/ + .syntaxhighlighter .line.highlighted.number { color: black !important; } @@ -251,7 +254,7 @@ } .syntaxhighlighter .gutter .line.highlighted { background-color: #6ce26c !important; - color: white !important; + /*color: white !important;*/ } .syntaxhighlighter.printing .line .content { border: none !important; @@ -261,7 +264,7 @@ } .syntaxhighlighter.collapsed .toolbar { color: blue !important; - background: white !important; + /*background: white !important;*/ border: 1px solid #6ce26c !important; } .syntaxhighlighter.collapsed .toolbar a { diff --git a/includes/syntax/styles/shThemeDefault.css b/includes/syntax/styles/shThemeDefault.css index 1365411..bbf1d05 100644 --- a/includes/syntax/styles/shThemeDefault.css +++ b/includes/syntax/styles/shThemeDefault.css @@ -14,6 +14,8 @@ * @license * Dual licensed under the MIT and GPL licenses. */ + +/* .syntaxhighlighter { background-color: white !important; } @@ -26,6 +28,8 @@ .syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { background-color: #e0e0e0 !important; } +*/ + .syntaxhighlighter .line.highlighted.number { color: black !important; } -- 2.30.2 From c000288ec5cdf406a0f3337d42d284b2cbc5d148 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 22 Dec 2012 19:20:03 +0000 Subject: [PATCH 14/16] rm'd background from submit buttons --- includes/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/style.css b/includes/style.css index 8128933..abf4883 100644 --- a/includes/style.css +++ b/includes/style.css @@ -160,8 +160,7 @@ text-align:left; } #comment .submit { -background:#FFF; -border:1px solid #FFF; +border:none; color:blue; cursor:pointer; font-size:120%; -- 2.30.2 From 05ee354833cf176bb87fd388062e3f4437906873 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Wed, 13 Feb 2013 03:41:42 -0500 Subject: [PATCH 15/16] don't load comment js on index --- view/index.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/view/index.php b/view/index.php index 2f9b0c9..dd57224 100644 --- a/view/index.php +++ b/view/index.php @@ -7,23 +7,7 @@ - - - - - - + -- 2.30.2 From cc745a8bb5f5cde272e87edf1aee498b2400b631 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Wed, 13 Feb 2013 03:42:25 -0500 Subject: [PATCH 16/16] formatting changes, projects list update --- view/index.php | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/view/index.php b/view/index.php index dd57224..d13cbc3 100644 --- a/view/index.php +++ b/view/index.php @@ -35,21 +35,24 @@ } ?>
    • -

      things i've done for others:

      +

      things i've worked on:

    • activehamptons.com
      • + "https://duckduckgo.com">duckduckgo.com
    • transfishing.com
      • + "http://tempositions.com">tempositions.com
    • -

      something i've worked on:

      +

      things i've made for others:

    • tempositions.com
      • + "http://activehamptons.com">activehamptons.com + +
    • transfishing.com

    • my repositories:

      @@ -58,6 +61,9 @@
    • git://dylansserver.com
      • +
    • git://github.com/nospampleasemam
      • +

    • some notes:

      • @@ -76,16 +82,21 @@
    • -


    +
    +
    +
    +  
    - -- 2.30.2