From 3b953d1315db8da19a73fc525c8daa1c9409a8b0 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 20 Mar 2013 16:58:39 -0700
Subject: [PATCH] Template-path changes.

---
 class2.php                                    |  4 +--
 .../templates/footer_default.php              |  2 +-
 .../templates/header_default.php              |  0
 .../templates/login_template.php              |  0
 login.php                                     | 26 ++++++++++++++-----
 5 files changed, 23 insertions(+), 9 deletions(-)
 rename {e107_themes => e107_core}/templates/footer_default.php (99%)
 rename {e107_themes => e107_core}/templates/header_default.php (100%)
 rename {e107_themes => e107_core}/templates/login_template.php (100%)

diff --git a/class2.php b/class2.php
index 40bbe74e8..288f246df 100644
--- a/class2.php
+++ b/class2.php
@@ -1123,8 +1123,8 @@ else
 }
 
 $layout = isset($layout) ? $layout : '_default';
-define('HEADERF', e_THEME."templates/header{$layout}.php");
-define('FOOTERF', e_THEME."templates/footer{$layout}.php");
+define('HEADERF', e_CORE."templates/header{$layout}.php");
+define('FOOTERF', e_CORE."templates/footer{$layout}.php");
 
 if (!file_exists(HEADERF))
 {
diff --git a/e107_themes/templates/footer_default.php b/e107_core/templates/footer_default.php
similarity index 99%
rename from e107_themes/templates/footer_default.php
rename to e107_core/templates/footer_default.php
index 26558dd10..403c0e3c0 100644
--- a/e107_themes/templates/footer_default.php
+++ b/e107_core/templates/footer_default.php
@@ -335,7 +335,7 @@ $etag = md5($page);
 //header('Pragma:');
 // previously disabled or there is posted data
 $canCache = e107::canCache();
- header("Cache-Control: must-revalidate", true);	
+ header("Cache-Control: must-revalidate", true); //XXX testing it here to check for improvement. 
 if($canCache && !deftrue('e_NOCACHE') && $_SERVER['REQUEST_METHOD'] === 'GET' && $_SERVER['QUERY_STRING'] != 'logout')
 {
 	// header("Cache-Control: must-revalidate", true);	
diff --git a/e107_themes/templates/header_default.php b/e107_core/templates/header_default.php
similarity index 100%
rename from e107_themes/templates/header_default.php
rename to e107_core/templates/header_default.php
diff --git a/e107_themes/templates/login_template.php b/e107_core/templates/login_template.php
similarity index 100%
rename from e107_themes/templates/login_template.php
rename to e107_core/templates/login_template.php
diff --git a/login.php b/login.php
index 0fe36470c..ef01cbe72 100644
--- a/login.php
+++ b/login.php
@@ -20,7 +20,7 @@
 require_once("class2.php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
-if (USER || e_LOGIN != e_SELF) // Disable page if user logged in, or some custom e_LOGIN value is used.
+if ((USER || e_LOGIN != e_SELF) && !getperms('0')) // Disable page if user logged in, or some custom e_LOGIN value is used.
 {
 	header('location:'.e_BASE.'index.php');      
 	exit();
@@ -36,8 +36,11 @@ if ($use_imagecode)
 	$sec_img = new secure_image;
 }
 
-if (!USER) 
+if (!USER || getperms('0')) 
 {
+	
+	
+	
 	if (!defined('LOGINMESSAGE')) define('LOGINMESSAGE', '');		// LOGINMESSAGE only appears with errors
 	require_once(e_HANDLER.'form_handler.php');
 	$rs = new form;
@@ -62,23 +65,34 @@ if (!USER)
 	}
 	$LOGIN_TABLE_AUTOLOGIN = "<input type='checkbox' name='autologin' value='1' />";
 	$LOGIN_TABLE_AUTOLOGIN_LAN = LAN_LOGIN_8;
-	$LOGIN_TABLE_SUBMIT = "<input class='button' type='submit' name='userlogin' value=\"".LAN_LOGIN_9."\" />";
+	$LOGIN_TABLE_SUBMIT = "<input class='btn btn-primary button' type='submit' name='userlogin' value=\"".LAN_LOGIN_9."\" />";
 
 	if (!isset($LOGIN_TABLE) || !$LOGIN_TABLE)
 	{
-		if (file_exists(THEME.'login_template.php'))
+		if (file_exists(THEME.'templates/login_template.php')) //v2.x path 
+		{
+			require_once(THEME.'templates/login_template.php');
+		}
+		elseif (file_exists(THEME.'login_template.php'))
 		{
 			require_once(THEME.'login_template.php');
 		}
 		else
 		{
-			require_once(e_BASE.$THEMES_DIRECTORY."templates/login_template.php");
+			require_once(e_CORE."templates/login_template.php");
 		}
 	}
 	$text = preg_replace("/\{(.*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE);
+	
+	if(getperms('0'))
+	{
+		echo "<div class='alert alert-block alert-error center'> You are currently logged in.</div>";	
+	}
+	
 	echo preg_replace("/\{(.*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE_HEADER);
 
-	$login_message = LAN_LOGIN_3." | ".SITENAME;
+//	$login_message = LAN_LOGIN_3." | ".SITENAME;
+		$login_message = SITENAME;
 	$ns->tablerender($login_message, $text, 'login_page');
 
 	$LOGIN_TABLE_FOOTER_USERREG = '&nbsp;';		// In case no registration system enabled