From 77022111c645ce69584a681c17662264ff370d7c Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Fri, 23 Mar 2012 05:23:43 -0400 Subject: [PATCH] all page types now served with model/view --- cms.php | 266 ---------------------------------------------- index.php | 2 +- model/archive.php | 80 ++++++++++++++ model/captcha.php | 18 ++++ model/index.php | 29 +++++ model/page.php | 68 ++++++++++++ model/project.php | 23 ++++ model/rss.php | 38 +++++++ view/index.php | 2 +- view/note.php | 18 ++-- view/page.php | 14 +-- view/rss.php | 2 +- 12 files changed, 275 insertions(+), 285 deletions(-) delete mode 100644 cms.php create mode 100644 model/archive.php create mode 100644 model/captcha.php create mode 100644 model/index.php create mode 100644 model/page.php create mode 100644 model/project.php create mode 100644 model/rss.php diff --git a/cms.php b/cms.php deleted file mode 100644 index b5b3b20..0000000 --- a/cms.php +++ /dev/null @@ -1,266 +0,0 @@ -model = new model(); - $config = parse_ini_file($this->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; - } - - 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': - $index = new index(); - $index->display(); - break; - case 'project': - $project = new project(); - $project->display(); - break; - case 'note': - require_once("model/note.php"); - $note = new note(); - require_once("view/note.php"); - break; - case 'page': - require_once("model/page.php"); - $page = new page(); - require_once("view/page.php"); - break; - case "rss": - require_once("model/rss.php"); - $rss = new rss(); - require_once("view/rss.php"); - break; - case 'archive': - $archive = new archive; - $archive->display(); - break; - case "captcha": - $captcha = new captcha; - $captcha->display(); - break; - } - } - -} - - -class index extends cms { - - public function display() { - require_once("view/index.php"); - } - - protected function display_exhibits() { - echo "
"; - $sql = "SELECT text FROM projects ORDER BY rank"; - $result = $this->db->query($sql); - while ($entry = $result->fetch_object()) { - echo $entry->text; - } - echo "
"; - } - - private function list_projects() { - $sql = "SELECT title FROM projects ORDER BY rank"; - $result = $this->db->query($sql); - while ($entry = $result->fetch_object()) { - echo "
  • $entry->title
    • "; - } - } - -} - - -class project extends index { - - protected function display_exhibits() { - echo "
    "; - $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(); - } - } - -} - - -class archive extends cms { - - public function __construct() { - parent::__construct(); - } - - private function check_exists() { - $sql = "SELECT COUNT(*) FROM notes - WHERE url = ?"; - $results = $this->query($sql, "s", $_GET['note']); - if ($results[0]["COUNT(*)"] != 1) { - $this->not_found(); - } - } - - public function display() { - require_once("view/archive.php"); - } - - public function display_notes() { - switch (true) { - case (isset($_GET['year']) && !isset($_GET['month']) - && !isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "d", - $_GET['year']); - break; - case (isset($_GET['year']) && isset($_GET['month']) - && !isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - AND MONTH(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "dd", - $_GET['year'], $_GET['month']); - break; - case (isset($_GET['year']) && isset($_GET['month']) - && isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - AND MONTH(date_posted) = ? - AND DAY(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "ddd", - $_GET['year'], $_GET['month'], - $_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)
    "; - } - } - -} - - -class notFound extends Exception { - - public function __construct() { - header('HTTP/1.0 404 Not Found'); - ob_end_clean(); - include('404.php'); - exit(); - } - -} - - -class captcha extends cms { - - public function display() { - $challenge = $_GET['challenge']; - $response = $_GET['response']; - $remoteip = $_SERVER['REMOTE_ADDR']; - $curl = curl_init('http://api-verify.recaptcha.net/verify?'); - curl_setopt ($curl, CURLOPT_POST, 4); - curl_setopt ($curl, CURLOPT_POSTFIELDS, "privatekey=$this->recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response"); - $result = curl_exec ($curl); - curl_close ($curl); - } - -} - -?> diff --git a/index.php b/index.php index 0964581..493069a 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,4 @@ diff --git a/model/archive.php b/model/archive.php new file mode 100644 index 0000000..0f805d4 --- /dev/null +++ b/model/archive.php @@ -0,0 +1,80 @@ +query($sql, "s", $_GET['note']); + if ($results[0]["COUNT(*)"] != 1) { + $this->not_found(); + } + } + + public function display() { + require_once("view/archive.php"); + } + + public function display_notes() { + switch (true) { + case (isset($_GET['year']) && !isset($_GET['month']) + && !isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "d", + $_GET['year']); + break; + case (isset($_GET['year']) && isset($_GET['month']) + && !isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + AND MONTH(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "dd", + $_GET['year'], $_GET['month']); + break; + case (isset($_GET['year']) && isset($_GET['month']) + && isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + AND MONTH(date_posted) = ? + AND DAY(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "ddd", + $_GET['year'], $_GET['month'], + $_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)
    "; + } + } + +} + +?> diff --git a/model/captcha.php b/model/captcha.php new file mode 100644 index 0000000..b2af33c --- /dev/null +++ b/model/captcha.php @@ -0,0 +1,18 @@ +recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response"); + $result = curl_exec ($curl); + curl_close ($curl); + } + +} + +?> diff --git a/model/index.php b/model/index.php new file mode 100644 index 0000000..dc8f6b3 --- /dev/null +++ b/model/index.php @@ -0,0 +1,29 @@ +"; + $sql = "SELECT text FROM projects ORDER BY rank"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo $entry->text; + } + echo ""; + } + + 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() ?>