X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=cms.php;h=a3d9c3b51fa722267be26903705a495aeb229a7d;hb=4db3a80e869ec8b8c3e0c3f8401c8df12ff5c553;hp=bd7ed60536fcaed9f1ae7b36212861b2ecb77fd9;hpb=ab2ed4cb0b2a7a397e868ca3ce6f7cde7a306b32;p=dylansserver.git diff --git a/cms.php b/cms.php index bd7ed60..a3d9c3b 100644 --- a/cms.php +++ b/cms.php @@ -1,16 +1,18 @@ model = new model(); $config = parse_ini_file($this->config_file, true); $this->db = new mysqli( $config['database']['domain'], @@ -26,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() { @@ -70,63 +53,24 @@ abstract class cms { } $statement->free_result(); return $return; - } - - public function display_head($title = "dylansserver", - $home_link = "/") { - $scripts = $this->scripts; - $stylesheets = ""; - $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&ucn_task=conformance#"; - echo << - - - - - - - $this->title - - $stylesheets - $scripts - - - -
- - -
-END_OF_HEAD; } - public function display_contact() { - echo <<

dylan

@psu.edu -
-END_OF_CONTACT; - } - - public function display_close($show_contact = true) { - if ($show_contact) { - $this->display_contact(); + 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'; } - echo << -
-
-
- - -END_OF_CLOSE; - ob_flush(); } public function init() { @@ -140,8 +84,9 @@ END_OF_CLOSE; $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; @@ -221,24 +166,6 @@ class page extends cms { public function __construct() { parent::__construct(); $this->page_offset(); - $this->scripts = " - - - - - - "; } private function page_offset() { @@ -295,219 +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() { - $this->scripts = " - - - - - - "; - - if (isset($_GET['comments'])) { - $this->scripts .= " - - "; - } - 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 << - $head - $text -
-END_OF_COMMENT; - } - echo ""; - } - - private function display_comment_form() { - $publickey = $this->recaptcha_publickey; - echo << -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'); - $url = $this->url . "verify"; - echo "
"; - echo << -

comment:

- -

name:

- - - -
-
-

what's this say?

-
-
-


-


- -

-

enter the numbers you hear:

- - another? / - audio? / - image?help? - -
-END_OF_FORM; - echo recaptcha_get_html($this->recaptcha_publickey); - if ($this->failed_captcha) { - echo << - reCAPTCHA said you're not human,
- try again? - - - - -END_OF_ERRORS; - } else { - echo << - reCAPTCHA said you're not human,
- try again? - -
- but you didn't write anything!
-
-END_OF_ERRORS; - } - echo << - - -END_OF_FORM; - } -} - - class archive extends cms { public function __construct() { @@ -587,18 +301,15 @@ class archive extends cms { class rss extends cms { + public function display() { + require_once("view/rss.php"); + } + + public function display_items() { $result = $this->db->query("SELECT date_posted, title, text, url FROM notes ORDER BY date_posted DESC LIMIT 5"); - echo << - - dylansserver.com/notes/rss - http://dylansserver.com/notes - dylansserver.com/notes/rss - -END_OF_ENTRY; while ($entry = $result->fetch_object()) { $title = $entry->title; $date_posted = $entry->date_posted; @@ -614,18 +325,13 @@ END_OF_ENTRY; $description = substr($text, '0', ($end_of_first_sentence + 1)); } } - echo << - $title - $url - $url - $description - -END_OF_ENTRY; + echo ""; + echo " $title"; + echo " $url"; + echo " $url"; + echo " $description"; + echo ""; } - echo ""; - echo ""; - } }