From: Dylan Lloyd Date: Sun, 6 Mar 2011 17:42:42 +0000 (-0500) Subject: Merge branch 'archive' into dev X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=f870b65ad60d8ea7456384d38f8db6fd01275990;p=dylansserver.git Merge branch 'archive' into dev Decided to just go ahead and merge the archive feature. Also fixed archive pages to ORDER BY date_posted DESC. Also fixed formatting error on archive pages (.note's should be in #notes) --- f870b65ad60d8ea7456384d38f8db6fd01275990 diff --cc .htaccess index b507140,65a86c7..f2421fc --- a/.htaccess +++ b/.htaccess @@@ -9,4 -11,6 +9,10 @@@ RewriteRule ^notes/?$ notes/page/ RewriteRule ^notes/page/?$ notes/page/1 RewriteRule ^notes/page/([0-9]+)/?$ /index.php?page=$1 [L] + RewriteRule ^notes/([0-9]{4})/?$ /index.php?year=$1 [L] + RewriteRule ^notes/([0-9]{4})/([0-9]{2})/?$ /index.php?year=$1&month=$2 [L] + RewriteRule ^notes/([0-9]{4})/([0-9]{2})/([0-9]{2})/?$ /index.php?year=$1&month=$2&day=$3 [L] ++ ++## This needs to be last as to avoid catching /notes/ etc. +RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L] ++ diff --cc index.php index 29e4076,47a1ad4..700f69a --- a/index.php +++ b/index.php @@@ -1,361 -1,1 +1,453 @@@ - +config_file); + $this->db = new mysqli( + $config['domain'], + $config['user'], + $config['password'], + $config['database']); + if (mysqli_connect_errno()) { + echo "Problem connecting to database: "; + echo mysqli_connect_error(); + exit(); + } + 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'; + } + } + + 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 $key1=>$value1) $return[$i][$key1] = $value1; + $i++; + } + $statement->free_result(); + return $return; + } + + public function display_head($title = "dylanstestserver", + $home_link = "/") { + $scripts = ""; + $stylesheets = ""; + if (cms::determine_type() == "index") { + $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(); + } + echo << +
+
+
+ + +END_OF_CLOSE; + ob_flush(); + } + +} + +class index extends cms { + public function display() { + $this->display_head(); + $this->display_exhibits(); + echo ""; + $this->display_close($show_contact = false); + } + + protected function display_exhibits() { + echo "
"; + $sql = "SELECT text FROM projects"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo $entry->text; + } + echo "
"; + } + + private function list_projects() { + echo "
"; + echo << +

my projects:

+ +HEREDOC; + $sql = "SELECT title FROM projects"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo "
  • title\">$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 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() { + $this->display_head(); + 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]; + echo "
    "; + echo "

    $year_posted/$month_posted/$day_posted/$title

    "; + echo $entry['text']; + echo "
    "; + } + echo "
    "; + $this->write_navigation(); + $this->display_close(); + } + + private function write_navigation() { + echo "
    "; + echo "

    "; + if($this->page > 1){ + $previous_page = $this->page - 1; + echo "prev"; + } + if($this->page < $this->number_of_pages) { + $forward_page = $this->page + 1; + echo " next"; + } + echo "

    "; + echo "
    "; + } + +} + +class note extends cms { + + public function __construct() { + parent::__construct(); + $this->check_exists(); + } + + private function check_exists() { + $sql = "SELECT COUNT(*) FROM notes + WHERE url = ?"; + $results = $this->query($sql, "s", $_GET['note']); + if ($results[0]["COUNT(*)"] != 1) { + throw new notFound(); + } + } + + public function display() { + $this->display_head(); + $sql = "SELECT title, date_posted, text + FROM notes WHERE url = ?"; + $result = $this->query($sql, "s", + $_GET['note']); + $entry = $result[0]; + $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

    "; + echo $entry['text']; + $this->write_navigation(); + $this->display_close(); + } + + private function write_navigation() { + echo "
    "; + echo "
    "; + echo "

    "; + echo "notes/"; + echo "

    "; + echo "
    "; + } +} + ++ ++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() { ++ // this really needs its own pagination... ++ // there should be a class for that. ++ $this->display_head(); ++ 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 "

    $year_posted/$month_posted/$day_posted/$title

    "; ++ echo $entry['text']; ++ echo "
    "; ++ } ++ echo "
    "; ++ $this->write_navigation(); ++ } else { ++ echo "
    "; ++ echo "

    sorry, nothing here

    "; ++ echo "
    Empty set (0.00 sec)
    "; ++ } ++ $this->display_close(); ++ } ++ ++ private function write_navigation() { ++ echo "
    "; ++ echo "
    "; ++ echo "

    "; ++ // fill me in! ++ echo "

    "; ++ echo "
    "; ++ } ++} ++ ++ +class notFound extends Exception { + public function __construct() { + header("HTTP/1.0 404 Not Found"); + ob_end_clean(); + include("404.php"); + exit(); + } +} + +## now actually do something: +switch (cms::determine_type()) { + case "index": + $index = new index(); + $index->display(); + break; + case "project": + $project = new project(); + $project->display(); + break; + case "note": + $note = new note; + $note->display(); + break; + case "page": + $page = new page; + $page->display(); + break; ++ case "archive": ++ $archive = new archive; ++ $archive->display(); ++ break; +} + +?>