abstract class cms {
- private $config_file = '/etc/dylanstestserver.ini';
+ private $config_file = '/etc/dylansserver.ini';
protected $db;
protected $recaptcha_publickey;
protected $recaptcha_privatekey;
+ protected $scripts;
public $title;
public $home_link;
public function __construct() {
$config = parse_ini_file($this->config_file, true);
$this->db = new mysqli(
- $config[database]['domain'],
- $config[database]['user'],
- $config[database]['password'],
- $config[database]['database']);
+ $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();
return 'index';
} else if (isset($_GET['project'])) {
return 'project';
- } else if (isset($_GET['challenge'])) {
+ } else if (isset($_GET['rss'])) {
+ return 'rss';
+ } else if (isset($_GET['challenge'])) {
return 'captcha';
}
}
return $return;
}
- public function display_head($title = "dylanstestserver",
+ public function display_head($title = "dylansserver",
$home_link = "/") {
- $scripts = "";
+ $scripts = $this->scripts;
$stylesheets = "<link href='/includes/style.css' rel='stylesheet' type='text/css'>";
- if (cms::determine_type() == "index") {
- $scripts = "<script type='text/javascript' src='/includes/all.js'></script>";
- $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&ucn_task=conformance#";
- } else if ($this->determine_type() == 'note') {
- $scripts = "<script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>";
- $scripts .= "<script type='text/javascript' src='/includes/jquery-core.js'></script>";
- $scripts .= "<script type='text/javascript' src='/includes/jquery-all-components.js'></script>";
- $scripts .= "<script type='text/javascript' src='/includes/ajax.js'></script>";
- }
+ $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&ucn_task=conformance#";
echo <<<END_OF_HEAD
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<title>$this->title</title>
- <link rel="icon" href="favicon.ico" type="image/png">
+ <link rel="icon" href="/favicon.ico" type="image/png">
$stylesheets
$scripts
</head>
-<body>
+<body onload="return typeof highlight == 'function' ? highlight() : true;">
<div id="structure">
<div id="banner">
<a href="$this->home_link">
- <img src="/images/dylanstestserver.png" alt="dylanstestserver"
+ <img src="/images/dylansserver.png" alt="dylansserver"
border="0"></a>
</div>
class index extends cms {
public function display() {
+ $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>";
$this->display_head();
$this->display_exhibits();
- echo "<ul id='portfolio' style='text-align:right'>";
+ echo "<ul id='portfolio'>";
$this->list_projects();
echo <<<OTHER_PROJECTS
<li>
</li>
<li><a href=
- "git">git://dylanstestserver.com</a></li>
+ "/git/">git://dylansserver.com</a></li>
<li>
<h3>some notes:</h3>
</li>
<li><a href=
- "/notes/">here</a></li>
+ "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
+
+ <li>
+ <h3>my resume:</h3>
+ </li>
+
+ <li>[<a href=
+ "/resume">pdf</a>]</li>
<li>
</li>
protected function display_exhibits() {
echo "<div id='exhibit'>";
- $sql = "SELECT text FROM projects";
+ $sql = "SELECT text FROM projects ORDER BY rank";
$result = $this->db->query($sql);
while ($entry = $result->fetch_object()) {
echo $entry->text;
<h3>my projects:</h3>
</li>
HEREDOC;
- $sql = "SELECT title FROM projects";
+ $sql = "SELECT title FROM projects ORDER BY rank";
$result = $this->db->query($sql);
while ($entry = $result->fetch_object()) {
echo "<li><a class='tab' href='$entry->title'>$entry->title</a></li>";
public function __construct() {
parent::__construct();
$this->page_offset();
+ $this->scripts = "
+ <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+ <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+ <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+ <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+ <script type='text/javascript'>
+ function highlight() {
+ SyntaxHighlighter.autoloader(
+ 'js /includes/syntax/scripts/shBrushJScript.js',
+ 'bash /includes/syntax/scripts/shBrushBash.js',
+ 'sql /includes/syntax/scripts/shBrushSql.js',
+ 'cpp /includes/syntax/scripts/shBrushCpp.js');
+ SyntaxHighlighter.defaults['gutter'] = false;
+ SyntaxHighlighter.defaults['toolbar'] = false;
+ SyntaxHighlighter.all();
+ }
+ </script>
+ ";
}
private function page_offset() {
$month_posted = $date_posted[1];
$datetime_posted = explode(' ', $date_posted[2]);
$day_posted = $datetime_posted[0];
- echo "<div class='note'>";
- echo "<h2><span style='color:grey;'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h2>";
- echo $entry['text'];
- echo "</div>";
+ $text = $entry['text'];
+ echo <<<END_NOTE
+ <div class='note'>
+ <h1>
+ <span class='date'>$year_posted/$month_posted/$day_posted/</span><a rel="canonical" href='$url'>$title</a>
+ </h1>
+ $text
+ </div>
+END_NOTE;
}
echo "</div>";
$this->write_navigation();
private function write_navigation() {
echo "<div id='navigation'>";
- echo "<h2>";
+ echo "<h1>";
if($this->page > 1){
$previous_page = $this->page - 1;
echo "<a href='/notes/page/$previous_page'>prev</a>";
$forward_page = $this->page + 1;
echo " <a href='/notes/page/$forward_page'>next</a>";
}
- echo "</h2>";
+ echo "</h1>";
echo "</div>";
}
public $number_of_comments;
public function __construct() {
+ $this->scripts = "
+ <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+ <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+ <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+ <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+ <script type='text/javascript'>
+ function highlight() {
+ SyntaxHighlighter.autoloader(
+ 'js /includes/syntax/scripts/shBrushJScript.js',
+ 'bash /includes/syntax/scripts/shBrushBash.js',
+ 'sql /includes/syntax/scripts/shBrushSql.js',
+ 'cpp /includes/syntax/scripts/shBrushCpp.js');
+ SyntaxHighlighter.defaults['gutter'] = false;
+ SyntaxHighlighter.defaults['toolbar'] = false;
+ SyntaxHighlighter.all();
+ }
+ </script>
+ ";
+
+ if (isset($_GET['comments'])) {
+ $this->scripts .= "
+ <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+ <script type='text/javascript' src='/includes/comment.js'></script>";
+ }
parent::__construct();
if (isset($_GET['comments'])) {
$this->comments_enabled = true;
// and a default author needs to be set
// for no-javascript users.
$stmt->bind_param('sss',
- htmlspecialchars($_POST['name']),
- htmlspecialchars($_POST['text']),
+ $_POST['name'],
+ $_POST['text'],
$this->id);
$stmt->execute();
}
private function display_note() {
echo <<<END_OF_NOTE
<div id='note'>
- <h2><span style='color:grey;'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>
+ <h1><span class='date'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h1>
$this->text
</div>
END_OF_NOTE;
private function write_navigation() {
echo <<<END_OF_NAVIGATION
- <br>
+ <br><br><br><br>
<div id='navigation'>
- <h2>
+ <h1>
END_OF_NAVIGATION;
if (!$this->comments_enabled) {
$this->display_comment_link();
}
echo <<<END_OF_NAVIGATION
- <a href="/notes/">back to notes</a>/
- </h2>
+ <a href="/notes/">back to notes/</a>
+ </h1>
</div>
END_OF_NAVIGATION;
}
$date_posted = $entry['date_posted'];
$author = $entry['author'];
$text = htmlspecialchars($entry['text']);
- $head = "<h3>$author</h3>";
+ $head = "<h3>" . htmlspecialchars($author) . "</h3>";
echo <<<END_OF_COMMENT
<div class='comment'>
$head
<nowiki>
<div id="recaptcha_widget">
- <h3 class="recaptcha_only_if_image"><b>what's this say</b>?</h3>
- <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
- <span style="font-size:80%;">
- ( <a href="javascript:Recaptcha.reload()">another</a> /
- <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span> /
- <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
- </span>
- <br><br>
+ <br>
+ <h3><b>what's this say</b>?</h3>
+ <br>
+ <div id="recaptcha_image"></div>
+ <br><br><br>
+ <span class="recaptcha_only_if_image"><br><br><br></span>
<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
<br><br>
- <div style="float:right;position:relative;width:100px;">
- <div id="recaptcha_image"></div>
- </div>
- <br><br><br><br>
+ <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
+ <span class="recaptcha_help">
+ <a href="javascript:Recaptcha.reload()">another?</a> /
+ <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio?</a> /</span>
+ <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image?</a></span><a href="javascript:Recaptcha.showhelp()">help?</a>
+ </span>
</div>
END_OF_FORM;
echo recaptcha_get_html($this->recaptcha_publickey);
$datetime_posted = explode(' ', $date_posted[2]);
$day_posted = $datetime_posted[0];
echo "<div class='note'>";
- echo "<h2><span style='color:grey;'>";
+ echo "<h1><span class='date'>";
echo "$year_posted/$month_posted/$day_posted/";
- echo "</span><a href='$url'>$title</a></h2>";
+ echo "</span><a href='$url'>$title</a></h1>";
echo $entry['text'];
echo "</div>";
}
$this->write_navigation();
} else {
echo "<br>";
- echo "<h2 style='font-family:sans-serif;'>sorry, nothing here</h2>";
+ echo "<h1>sorry, nothing here</h2>";
echo "<pre>Empty set (0.00 sec)</pre>";
}
$this->display_close();
private function write_navigation() {
echo "<br>";
echo "<div id='navigation'>";
- echo "<h2>";
// fill me in!
- echo "</h2>";
echo "</div>";
}
}
+class rss extends cms {
+ public function display() {
+ $result = $this->db->query("SELECT date_posted, title, text, url
+ FROM notes ORDER BY date_posted DESC
+ LIMIT 5");
+ echo <<<END_OF_ENTRY
+ <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+ <channel>
+ <title>dylansserver.com/notes/rss</title>
+ <link>http://dylansserver.com/notes</link>
+ <description>dylansserver.com/notes/rss</description>
+ <atom:link href="http://dylansserver.com/notes/rss" rel="self" type="application/rss+xml" />
+END_OF_ENTRY;
+ 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 <<<END_OF_ENTRY
+ <item>
+ <title>$title</title>
+ <link>$url</link>
+ <guid>$url</guid>
+ <description>$description</description>
+ </item>
+END_OF_ENTRY;
+ }
+ echo "</channel>";
+ echo "</rss>";
+
+ }
+}
+
+
class notFound extends Exception {
public function __construct() {
$page = new page;
$page->display();
break;
+ case "rss":
+ $rss = new rss();
+ $rss->display();
+ break;
case 'archive':
$archive = new archive;
- $archive->display();
- break;
+ $archive->display();
+ break;
case "captcha":
$captcha = new captcha;
$captcha->display();