X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;ds=sidebyside;f=cms.php;h=b5b3b201b33635311c3b857b9552275e4ccfa8f6;hb=0e6804f62c676f4dba6050e7cd2b1b5fffeac867;hp=1f455a4c1c35f480877bc552295474c1251fe3ed;hpb=4a70b93a36c54e64e32e6d34e8d79dbb8fc8789c;p=dylansserver.git
diff --git a/cms.php b/cms.php
index 1f455a4..b5b3b20 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,16 +84,19 @@ 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;
- $page->display();
+ require_once("model/page.php");
+ $page = new page();
+ require_once("view/page.php");
break;
case "rss":
+ require_once("model/rss.php");
$rss = new rss();
- $rss->display();
+ require_once("view/rss.php");
break;
case 'archive':
$archive = new archive;
@@ -153,261 +158,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 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 "";
- }
-
- private function display_comments() {
- echo "
-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 "
-
-END_OF_ERRORS;
- } else {
- echo <<
- reCAPTCHA said you're not human,
- try again?
-
-
-END_OF_ERRORS;
- }
- echo <<
-
-
-END_OF_FORM;
- }
-}
-
-
class archive extends cms {
public function __construct() {
@@ -486,42 +236,6 @@ 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");
- 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 "
";
- }
- }
-}
-
-
class notFound extends Exception {
public function __construct() {
" . htmlspecialchars($author) . "
"; - echo <<