From a6613cb515874fd19a51115c6dc5a0b61d2b6762 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Sun, 24 Jul 2011 20:57:48 +0000
Subject: [PATCH] Minor fixes and sync with 0.7

---
 e107_core/bbcodes/bb_youtube.php       | 29 +++++++++++++-------------
 e107_plugins/faqs/faqs.php             | 25 +++++++++++++---------
 e107_plugins/links_page/link_class.php |  2 +-
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/e107_core/bbcodes/bb_youtube.php b/e107_core/bbcodes/bb_youtube.php
index 0383391d2..a7d082e39 100644
--- a/e107_core/bbcodes/bb_youtube.php
+++ b/e107_core/bbcodes/bb_youtube.php
@@ -179,37 +179,38 @@ class bb_youtube extends e_bb_base
 		switch ($parms[0]) 
 		{
 			case 'tiny':
-				$params['w'] = 200;
-				$params['h'] = 180;
+				$params['w'] = 320; // 200;
+				$params['h'] = 205; // 180;
 			break;
 			
 			case 'small':
-				$params['w'] = 445;
-				$params['h'] = 364;
+				$params['w'] = 560; // 445;
+				$params['h'] = 340; // 364;
 			break;
 			
 			case 'medium':
-				$params['w'] = 500;
-				$params['h'] = 405;
+				$params['w'] = 640; // 500;
+				$params['h'] = 385; // 405;
 			break;
 			
 			case 'big':
-				$params['w'] = 660;
-				$params['h'] = 525;
+			case 'large':
+				$params['w'] = 853; // 660;
+				$params['h'] = 505; // 525;
 			break;
 			
 			case 'huge':
-				$params['w'] = 980;
-				$params['h'] = 765;
+				$params['w'] = 1280; // 980;
+				$params['h'] = 745; // 765;
 			break;
 			
-			default:
-				$dim = explode(',', $parms[0], 2);
+			default: // maximum 1920 x 1080 (+25)
+				$dim = explode(',', $dimensions, 2);
 				$params['w'] = (integer) varset($dim[0], 445);
-				if($params['w'] > 980 || $params['w'] < 200) $params['w'] = 445;
+				if($params['w'] > 1920 || $params['w'] < 200) $params['w'] = 640;
 				
 				$params['h'] = (integer) varset($dim[1], 364);
-				if($params['h'] > 765 || $params['h'] < 180) $params['h'] = 364;
+				if($params['h'] > 1105 || $params['h'] < 137) $params['h'] = 385;
 			break;
 		}
 
diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php
index b0642bab4..9473a9e46 100644
--- a/e107_plugins/faqs/faqs.php
+++ b/e107_plugins/faqs/faqs.php
@@ -106,13 +106,13 @@ if (isset($_POST['commentsubmit']))
 	{
 		if(vartrue($faqpref['classic_look']))
 		{
-			$tmp = $faq->show_existing_parents($action, $sub_action, $id, $from, $amount);
+			$ftmp = $faq->show_existing_parents($action, $sub_action, $id, $from, $amount);
 			$caption = FAQLAN_41;
 		}
 		else
 		{
-			$tmp = $faq->view_all();
-			$caption = FAQLAN_FAQ;
+			$ftmp = $faq->view_all();
+			$caption = FAQLAN_FAQ;			
 		}
 
 		if (vartrue($faqpref['faq_title']))
@@ -123,25 +123,28 @@ if (isset($_POST['commentsubmit']))
 		{
 			define("e_PAGETITLE", FAQLAN_23);
 		}
+
 		require_once (HEADERF);
-		$ns->tablerender($caption, $tmp['text']);
+				
+		$ns->tablerender($caption, $ftmp['text']);
+		
 	}
 
 	if($action == "cat" && $idx)
 	{
-		 $tmp = $faq->view_faq($idx) ;
-		 define("e_PAGETITLE",FAQLAN_FAQ." - ". $tmp['title']);
+		 $ftmp = $faq->view_faq($idx) ;
+		 define("e_PAGETITLE",FAQLAN_FAQ." - ". $ftmp['title']);
 		 require_once(HEADERF);
-		 $ns -> tablerender($tmp['caption'], $tmp['text']);
+		 $ns -> tablerender($ftmp['caption'], $ftmp['text']);
 	}
 
 	if ($action == "cat")
 	{
-		$tmp = $faq->view_cat_list($action, $id);
+		$ftmp = $faq->view_cat_list($action, $id);
 
-		define("e_PAGETITLE", strip_tags($tmp['title'].$tmp['caption']));
+		define("e_PAGETITLE", strip_tags($ftmp['title'].$ftmp['caption']));
 		require_once (HEADERF);
-		$ns->tablerender($tmp['caption'], $tmp['text']);
+		$ns->tablerender($ftmp['caption'], $ftmp['text']);
 	}
 
 
@@ -172,6 +175,7 @@ class faq
 	{
 		$sql = e107::getDb();
 		$tp = e107::getParser();
+		$ret = array();
 
 		global $FAQ_START, $FAQ_END, $FAQ_LISTALL_START,$FAQ_LISTALL_LOOP,$FAQ_LISTALL_END;
 
@@ -206,6 +210,7 @@ class faq
 		$ret['title'] = FAQLAN_FAQ;
 		$ret['text'] = $text;
 		$ret['caption'] = $caption;
+		
 		return $ret;
 	}
 
diff --git a/e107_plugins/links_page/link_class.php b/e107_plugins/links_page/link_class.php
index 6447ddfbf..fe5e8def6 100644
--- a/e107_plugins/links_page/link_class.php
+++ b/e107_plugins/links_page/link_class.php
@@ -835,7 +835,7 @@ class linkclass
         ".$rs -> form_close()."
         </div>";
 
-        $ns->tablerender(LCLAN_ITEM_24, $text);
+        $ns->tablerender(LCLAN_PAGETITLE_1, $text);
     }
 
     function show_links()