disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69fc1a7)
Moved script logic to respective classes
authorDylan Lloyd <dylan@psu.edu>
Sat, 26 Mar 2011 20:02:48 +0000 (16:02 -0400)
committerDylan Lloyd <dylan@psu.edu>
Sat, 26 Mar 2011 20:02:48 +0000 (16:02 -0400)
index.php patch | blob | history

diff --git a/index.php b/index.php
index 54b5bf2..c2fb078 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,6 +6,7 @@ abstract class cms {
   protected $db;
   protected $recaptcha_publickey;
   protected $recaptcha_privatekey;
+  protected  $scripts;
   public $title;
   public $home_link;
 
@@ -71,16 +72,9 @@ abstract class cms {
 
   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=dylansserver.com&amp;ucn_task=conformance#";
-    } else if ($this->determine_type() == 'note'
-                 && isset($_GET['comments'])) {
-      $scripts = "<script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>";
-      $scripts .= "<script type='text/javascript' src='/includes/comment.js'></script>";
-    }
+    $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&amp;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">
@@ -139,6 +133,7 @@ END_OF_CLOSE;
 class index extends cms {
 
   public function display() {
+    $this->scripts = "<script type='text/javascript' src='/includes/all.js'></script>"; 
     $this->display_head();
     $this->display_exhibits();
     echo "<ul id='portfolio' style='text-align:right'>";
@@ -323,6 +318,11 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
+    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;
my (old) website