From 1a790c12ab2a6138ca40d234f686aa29064a33f2 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Tue, 29 May 2012 23:36:25 +0000
Subject: [PATCH] FB work

---
 e107_files/jslib/core/all.jquery.js  |  2 +-
 e107_plugins/facebook/plugin.xml     | 23 ++++++++++++-----------
 e107_plugins/facebook_old/plugin.xml |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js
index 38345d34d..cf0e3f11a 100644
--- a/e107_files/jslib/core/all.jquery.js
+++ b/e107_files/jslib/core/all.jquery.js
@@ -254,7 +254,7 @@ $(document).ready(function()
 		});
 
 		// Text-area AutoGrow
-		$("textarea.e-autoheight").elastic();
+	//	$("textarea.e-autoheight").elastic();
 
 		
 		
diff --git a/e107_plugins/facebook/plugin.xml b/e107_plugins/facebook/plugin.xml
index 637dbbd15..06a5517ef 100644
--- a/e107_plugins/facebook/plugin.xml
+++ b/e107_plugins/facebook/plugin.xml
@@ -2,17 +2,18 @@
 
 <!-- $Id: plugin.xml,v 1.3 2009-11-10 13:41:41 e107coders Exp $ -->
 
-<e107Plugin name="Facebook" version="0.3" compatibility="0.8" installRequired="true">
-	<author name="Luca Filosofi" url="http://ask.altervista.org" email="aseptik@gmail.com" />
-	<description>Facebook Connect for e107</description>
-	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
+<e107Plugin name="Facebook" version="1.0" compatibility="0.8" installRequired="true">
+	<author name="e107 Inc." url="http://e107.org" email="" />
+	<description>Facebook Integration for e107</description>
+	<copyright>2012 e107 Inc. Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<category>Auth</category>
 	<adminLinks>
-		<link url='facebook_config.php' description='Facebook Connect' icon='images/icon_32.png' iconSmall='images/icon_16.png' primary='true' >Facebook Connect</link>		
+		<link url='admin_config.php' description='Facebook Integration' icon='images/icon_32.png' iconSmall='images/icon_16.png' primary='true' >Facebook</link>		
 	</adminLinks>
-	<mainPrefs>
-		<pref name="Facebook_Api-Key"></pref>
-		<pref name="Facebook_Secret-Key"></pref>
-		<pref name="Facebook_App-Bundle" active='false'></pref>
-	</mainPrefs>
-</e107Plugin>
\ No newline at end of file
+	<pluginPrefs>
+		<pref name="appId"></pref>
+		<pref name="status">true</pref>
+		<pref name="xfbml">true</pref>
+		<pref name="oauth">true</pref>
+	</pluginPrefs>
+</e107Plugin>
diff --git a/e107_plugins/facebook_old/plugin.xml b/e107_plugins/facebook_old/plugin.xml
index 637dbbd15..276909d8d 100644
--- a/e107_plugins/facebook_old/plugin.xml
+++ b/e107_plugins/facebook_old/plugin.xml
@@ -2,7 +2,7 @@
 
 <!-- $Id: plugin.xml,v 1.3 2009-11-10 13:41:41 e107coders Exp $ -->
 
-<e107Plugin name="Facebook" version="0.3" compatibility="0.8" installRequired="true">
+<e107Plugin name="Facebook_old" version="0.3" compatibility="0.8" installRequired="true">
 	<author name="Luca Filosofi" url="http://ask.altervista.org" email="aseptik@gmail.com" />
 	<description>Facebook Connect for e107</description>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>