From de1ec15976a8eecfb6711991fd2d3f0cef7a62c6 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 15 Jan 2017 08:56:13 -0800
Subject: [PATCH] New Constant: THEME_LEGACY added. Old themes will have a
 value of true, new themes (using theme.xml) as false.

---
 class2.php                       | 17 ++++++++++++++++-
 e107_handlers/db_debug_class.php |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/class2.php b/class2.php
index 22dc997eb..b2c7248f3 100644
--- a/class2.php
+++ b/class2.php
@@ -823,6 +823,7 @@ if (!function_exists('checkvalidtheme'))
 	{
 		// arg1 = theme to check
 		//global $ADMIN_DIRECTORY, $tp, $e107;
+		global $sql;
 		$e107 = e107::getInstance();
 		$tp = e107::getParser();
 		$ADMIN_DIRECTORY = $e107->getFolder('admin');
@@ -846,15 +847,27 @@ if (!function_exists('checkvalidtheme'))
 			define('PREVIEWTHEMENAME', $themeArray[$id]);
 			define('THEME', e_THEME.$themeArray[$id].'/');
 			define('THEME_ABS', e_THEME_ABS.$themeArray[$id].'/');
-			
+
+			$legacy = (file_exists( e_THEME_ABS.$themeArray[$id].'/theme.xml') === false);
+
+			define('THEME_LEGACY',$legacy);
 	
 			
 			return;
 		}
+
+		$sql->db_Mark_time("Theme Check");
+
 		if (@fopen(e_THEME.$theme_check.'/theme.php', 'r'))
+	//	if (is_readable(e_THEME.$theme_check.'/theme.php'))
 		{
 			define('THEME', e_THEME.$theme_check.'/');
 			define('THEME_ABS', e_THEME_ABS.$theme_check.'/');
+
+			$legacy = (file_exists(e_THEME.$theme_check.'/theme.xml') === false);
+
+			define('THEME_LEGACY',$legacy);
+
 			$e107->site_theme = $theme_check;
 		}
 		else
@@ -889,6 +902,8 @@ if (!function_exists('checkvalidtheme'))
 				
 			}
 		}
+		$sql->db_Mark_time("Theme Check End");
+
 		$themes_dir = $e107->getFolder('themes');
 		$e107->http_theme_dir = "{$e107->server_path}{$themes_dir}{$e107->site_theme}/";
 	}
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index 6af73d89b..3874c4c4e 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -605,7 +605,7 @@ class e107_db_debug {
 		$inc = array(
 			'BOOTSTRAP','HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET',
 			'GUESTS_ONLINE','MEMBERS_ONLINE','PAGE_NAME','STANDARDS_MODE','TIMEOFFSET',
-			'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER'
+			'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT', 'THEME_LEGACY','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER'
 		);
 		
 		$userCon = get_defined_constants(true);