X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=485b0636a59ee2653844391c2ebac0df3e0f87da;hb=f4311d6999688a97e69368017d511cd13e4b7c1f;hp=a93e0950f9cbbbb34afa6cdd22d8c0f983d2b65f;hpb=2896368ff2e6a5dec69ab99a07491447825fc1d5;p=dylansserver.git

diff --git a/index.php b/index.php
index a93e095..485b063 100644
--- 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();
@@ -243,15 +243,17 @@ class page extends cms {
     $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'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'></link>
+        <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');
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
             SyntaxHighlighter.defaults['gutter'] = false;
+            SyntaxHighlighter.defaults['toolbar'] = false;
             SyntaxHighlighter.all();
           }
         </script>
@@ -344,22 +346,24 @@ class note extends cms {
       $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'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'></link>
+        <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');
+             '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 += "
+      $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>";
     }
@@ -431,8 +435,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();
     }
@@ -487,7 +491,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