disinclined.org / git / dylansserver.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added ORDER BY rank to projects sql
[dylansserver.git] / index.php
diff --git a/index.php b/index.php
index d2715af..8cb1d62 100644 (file)
--- a/index.php
+++ b/index.php
@@ -13,10 +13,10 @@ abstract class cms {
   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();
@@ -93,7 +93,7 @@ abstract class cms {
   $scripts
 </head>
 
-<body>
+<body onload="return typeof highlight == 'function' ? highlight() : true;">
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
@@ -138,7 +138,7 @@ class index extends cms {
     $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>"; 
     $this->display_head();
     $this->display_exhibits();
-    echo "<ul id='portfolio'";
+    echo "<ul id='portfolio'>";
     $this->list_projects();
     echo <<<OTHER_PROJECTS
         <li>
@@ -163,7 +163,7 @@ class index extends cms {
         </li>
 
         <li><a href=
-        "git">git://dylansserver.com</a></li>
+        "/git/">git://dylansserver.com</a></li>
 
         <li>
           <h3>some notes:</h3>
@@ -172,6 +172,13 @@ class index extends cms {
         <li><a href=
         "/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>
 OTHER_PROJECTS;
@@ -187,7 +194,7 @@ OTHER_PROJECTS;
 
   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;
@@ -201,7 +208,7 @@ OTHER_PROJECTS;
           <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>";
@@ -219,7 +226,7 @@ class project extends index {
              WHERE title = ?";
     $result = $this->query($sql, "s", $_GET['project']);
     if ($result = $result[0]['text']) {
-      $text =  str_replace("class='exhibit'", "class='exhibit'", $result);
+      $text =  str_replace("class='exhibit'", "class='exhibit' style='display:block;'", $result);
       echo $text;
       echo "</div>";
     } else {
@@ -240,6 +247,24 @@ class page extends cms {
   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() {
@@ -325,8 +350,27 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
-    if (isset($_GET['comments'])) {
       $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>";
     }
@@ -398,8 +442,8 @@ class note extends cms {
       // 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();
     }
@@ -454,7 +498,7 @@ 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
my (old) website