From f4943b4f73313eb70cf0ec26faefa458b46f08f4 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Sun, 1 May 2011 08:55:15 +0000
Subject: [PATCH] siteinfo shortcode to match 0.7. fpw_template only asks for
 email when it is used as the login.

---
 .../shortcodes/batch/admin_shortcodes.php     |  7 +++++-
 e107_themes/templates/fpw_template.php        | 22 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index eea528f2a..9001b8678 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -776,7 +776,7 @@ class admin_shortcodes
 		}
 	}
 
-	function sc_admin_siteinfo()
+	function sc_admin_siteinfo($parm='')
 	{
 		if (ADMIN)
 		{
@@ -786,6 +786,11 @@ class admin_shortcodes
 			{
 				include(e_ADMIN.'ver.php');
 			}
+			
+			if($parm == "version")
+			{
+				return $e107info['e107_version'];
+			}
 
 			$obj = e107::getDateConvert();
 			$install_date = $obj->convert_date($pref['install_date'], 'long');
diff --git a/e107_themes/templates/fpw_template.php b/e107_themes/templates/fpw_template.php
index 8482b2936..4d1df2db4 100644
--- a/e107_themes/templates/fpw_template.php
+++ b/e107_themes/templates/fpw_template.php
@@ -15,15 +15,21 @@ if(!isset($FPW_TABLE))
 
 		<tr>
 		<td class='fcaption' colspan='2'>".LAN_05."</td>
-		</tr>
-
-		<tr>
-		<td class='forumheader3' style='width:70%'>".LAN_FPW1.":</td>
-		<td class='forumheader3' style='width:30%;text-align:center'>
-		<input class='tbox' type='text' name='username' size='40' value='' maxlength='100' />
-		</td>
-		</tr>
+		</tr>";
+		
+		if($pref['allowEmailLogin']==0)
+		{
+			$FPW_TABLE .= "
+			<tr>
+			<td class='forumheader3' style='width:70%'>".LAN_FPW1.":</td>
+			<td class='forumheader3' style='width:30%;text-align:center'>
+			<input class='tbox' type='text' name='username' size='40' value='' maxlength='100' />
+			</td>
+			</tr>";	
+		}
 
+		
+		$FPW_TABLE .="
 		<tr>
 		<td class='forumheader3' style='width:70%'>".LAN_112.":</td>
 		<td class='forumheader3' style='width:30%; text-align:center'>