Theme system has been implemented and we were trying to clean up any code

that was causing problems after the move.



git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2.1@474 c5b2fb0a-d05d-0410-98c8-828840a80ff6

5 files changed, 47 insertions, 22 deletions

diff --git a/blocks/donations/index.php b/blocks/donations/index.php
index 1329f20..7b62be4 100644
--- a/blocks/donations/index.php
+++ b/blocks/donations/index.php
@@ -1,12 +1,7 @@
-<table align="center" width="98%">
-<tr><td id="block">
-<center>
+
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick" />
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHPwYJKoZIhvcNAQcEoIIHMDCCBywCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYB02pTNLjJ9viE69oKIjYRn9waGeUXDObQnS4UMXyr791TDGSY0ekY9VialPYYHO62fCXnza4lbYuiywVBO7rtmANED7FFTL2MO5pSLpHvhY2RC/gXxId24P8EDg/+oxtlVkW3QxYN9bwGoN+YI7qHyDzBPFOcYg/eWVNuKhSCeazELMAkGBSsOAwIaBQAwgbwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQI27H2lXKV0t6AgZhtt2zkaDfgIG2AaAOITZYGnG1+bVRxgjLMPWsFSsKSQbZDCNF4AvE7deOiW96NMHVIJoW6Bd8eBiANNb3C/uMZ4VG+OOMoL5ZUiXrdxDNxdXj39r1V3AvIZQGiXRKXgzohwXsLCSNJTjoYGAf9XKfKjF/O7KHCBkaRMNiErNT9bhZo6a8fVL7IJFFZFeggRcKWgtPFo818h6CCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA5MTIyNjA1MzYxN1owIwYJKoZIhvcNAQkEMRYEFJph1XKiDvpvkS9qivFVa0yEu+5GMA0GCSqGSIb3DQEBAQUABIGAvd2V0F6+dYpeLUS5ygxOYUmgxuo8ORUYcRUp+J/ICWDkOrkJwFI1QfcH1hx9vdQUg1TNdREeovbEZx47T9G7HHVpZTcNCQeQNsz0IpFZTfmQAD71ad3qXQvJyh/ghsE/s9guMO6x5AQ1iQdA5ls928WvpqYx8EFs7fGvKYhrPzI=-----END PKCS7-----" />
 <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" />
 <!-- <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" /> -->
-</form>
-</center>
-</td></tr>
-</table>
+
diff --git a/index.php b/index.php
index 9d09f48..f9b7177 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,12 @@
 <?php

 

+/**

+ *  DO NOT MOVE THESE DEFINES 

+ */

 define('BAYONET_ROOT', basename(dirname('.')));

 define('BAYONET_INCLUDE', BAYONET_ROOT . '/include');

-define('BAYONET_CONFIG', 'include/config.ini');

+define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.ini');

 

-require_once BAYONET_CONFIG;

 require BAYONET_INCLUDE . '/config.php'; 

 require BAYONET_INCLUDE . '/debug.php';

 require BAYONET_INCLUDE . '/sql.class.php';

@@ -28,18 +30,33 @@ class Bayonet_Theme
 	static public $root_path;

 	static public $include_path;

 	static public $image_path;

+	static public $config_path;

 	static public $config;

 	static public $primary_css;

 	

 	static function init()

 	{

-		self::$name = Bayonet_Config::$ini['Theme']['name'];

+		if(!isset($_GET['theme']))

+		{

+			self::$name = Bayonet_Config::$ini['Theme']['name'];	

+		}

+		else

+		{

+			self::$name = $_GET['theme'];

+		}

+		

 		decho('Initializing theme variables for \'' . self::$name . '\'');

 		self::$root_path = dirname(BAYONET_ROOT) . '/themes/' . self::$name;

 		self::$include_path = self::$root_path . '/include';

 		self::$image_path = self::$root_path . '/images';

-		self::$primary_css = self::$include_path . '/' . self::$name . '.css';

-		self::$config = parse_ini_file(self::$include_path . '/' . self::$name . '.ini', true);

+		self::$primary_css = self::$include_path . '/primary.css';

+		self::$config_path = self::$include_path . '/theme.ini';

+

+		if(!self::is_valid())

+		{

+			die('Theme failed during initialization.');

+		}

+		self::$config = parse_ini_file(self::$config_path, true);

 

 		self::$index = self::$root_path . '/index.php';

 		self::$header = self::$root_path . '/header.php';

@@ -49,9 +66,22 @@ class Bayonet_Theme
 		self::load(); 

 	}

 	

+	static private function is_valid()

+	{

+		if(

+		file_exists(self::$root_path) && 

+		file_exists(self::$include_path) &&

+		file_exists(self::$config_path)

+		)

+			return true;

+		else

+			return false;		

+	}

+	

 	static function load()

 	{

 		global $db;

+

 		decho("Loading theme: '" . self::$name . "'");	

 		require self::$index;

 	}

diff --git a/themes/default/header.php b/themes/default/header.php
index b0dba31..556b770 100644
--- a/themes/default/header.php
+++ b/themes/default/header.php
@@ -34,8 +34,8 @@ $starttime = $starttime[1] + $starttime[0];
 <!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
 <link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
 <?php endif; ?>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$include_path . '/style.css'; ?>" media="screen"/>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$include_path . '/style_bbcode.css'; ?>" media="screen"/>
+<link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
+
 
 <script type="text/javascript" src="functions.js"></script>
 
diff --git a/themes/default/include/primary.css b/themes/default/include/primary.css
index 103c21b..93aa1ab 100644
--- a/themes/default/include/primary.css
+++ b/themes/default/include/primary.css
@@ -17,14 +17,14 @@
 		/*width: 990px; */
 		height: 28px;
 		background: #284c75;
-		background-image:url('images/navbackground.jpg');
+		background-image:url('../images/navbackground.jpg');
 		color: #000000;
 		text-align:center;
 		/* margin: auto auto; */
 		font-size:14px;
 	}
 	table.main {
-		background-image:url('images/sandbackground.jpg');
+		background-image:url('../images/sandbackground.jpg');
 	 	padding: 0px;
 		color:#ffffff;
 	 	width:990px;
@@ -70,7 +70,7 @@
 		border:1px solid #333333; 
 	}
  	div.contentHeading {
-		background-image:url(images/blockbackground.jpg);
+		background-image:url(../images/blockbackground.jpg);
 		background-repeat:repeat-x;
 		background-color:#112f50;
 		height:25px;
@@ -187,13 +187,13 @@
 	}
 	/* photo gallery styles */
     .photoleft{
-    	background-image:url("images/photoleft.png");
+    	background-image:url("../images/photoleft.png");
     	background-repeat:repeat-y;
      	text-align:center;
     	width:49px;
    	}
 	.photoright{
-		background-image:url("images/photoright.png");
+		background-image:url("../images/photoright.png");
 		background-repeat:repeat-y;
 		text-align:center;
 		width:49px;
@@ -220,13 +220,13 @@
 	}
 		/* may need these two when we add the background images back */  	 
 	.leftbar {
-	 /*	background-image:url("images/leftshadow.png");   */
+	 /*	background-image:url("../images/leftshadow.png");   */
 		background-repeat: 
 		repeat-y; 
 		width:50px;
 	}		
 	.rightbar {
-		/* background-image:url("images/rightshadow.png");  */
+		/* background-image:url("../images/rightshadow.png");  */
 		background-repeat: 
 		repeat-y; 
 		width:15px;
@@ -248,5 +248,5 @@
             font-family:arial;
     }
 
-
+@import "style_bbcode.css"
 
diff --git a/themes/default/include/default.ini b/themes/default/include/theme.ini
index 223cd14..223cd14 100644
--- a/themes/default/include/default.ini
+++ b/themes/default/include/theme.ini