From f6d863e74ed3a3a3f66af95f6493b7c20ac9a700 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sat, 27 Apr 2013 13:16:08 -0700
Subject: [PATCH] Path correction and styling fixes

---
 e107_core/shortcodes/batch/admin_shortcodes.php | 2 +-
 e107_handlers/form_handler.php                  | 6 +++---
 e107_plugins/chatbox_menu/chatbox_menu.php      | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 4cc91128e..a11062c96 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -20,7 +20,7 @@ class admin_shortcodes
 		if (!ADMIN) { return ''; }
 		return "
 		<div style='text-align: center'>
-		<input class='button' type='button' onclick=\"javascript: window.open('".e_ADMIN_ABS."credits.php', 'myWindow', 'status = 1, height = 400, width = 300, resizable = 0')\" value='".LAN_CREDITS."' />
+		<input class='btn button' type='button' onclick=\"javascript: window.open('".e_ADMIN_ABS."credits.php', 'myWindow', 'status = 1, height = 400, width = 300, resizable = 0')\" value='".LAN_CREDITS."' />
 		</div>";
 	}
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 5cd6efb01..87f012622 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -397,7 +397,7 @@ class e_form
 		$previnput	= $idinput."-preview";
 		$optioni 	= $idinput."-options";
 		
-		$img = (strpos($curVal,"://")!==false) ? $curVal : $tp->thumbUrl(e_MEDIA."avatars/default/".$curVal,"aw=".vartrue($width)."&ah=".vartrue($height));
+		$img = (strpos($curVal,"://")!==false) ? $curVal : $tp->thumbUrl(e_AVATAR_DEFAULT.$curVal,"aw=".vartrue($width)."&ah=".vartrue($height),true);
 		
 		if(!$curVal)
 		{
@@ -416,7 +416,7 @@ class e_form
 			$text .= "<input class='btn button e-expandit' type ='button' style='cursor:pointer' size='30' value=\"Choose Avatar\"  />"; //TODO Common LAN. 
 		}
 						
-		$avFiles = e107::getFile()->get_files(e_MEDIA."avatars/default/",".jpg|.png|.gif|.jpeg|.JPG|.GIF|.PNG");
+		$avFiles = e107::getFile()->get_files(e_AVATAR_DEFAULT,".jpg|.png|.gif|.jpeg|.JPG|.GIF|.PNG");
 			
 		$text .= "\n<div id='{$optioni}' style='display:none' >\n"; //TODO unique id. 
 		
@@ -433,7 +433,7 @@ class e_form
 				
 		foreach($avFiles as $fi)
 		{
-			$img_path = $tp->thumbUrl(e_MEDIA_ABS."avatars/default/".$fi['fname'],$attr);	
+			$img_path = $tp->thumbUrl(e_AVATAR_DEFAULT.$fi['fname'],$attr,true);	
 			$text .= "\n<a class='e-expandit' title='Choose this avatar' href='#{$optioni}'><img src='".$img_path."' alt=''  onclick=\"insertext('".$fi['fname']."', '".$idinput."');document.getElementById('".$previnput."').src = this.src;\" /></a> ";			
 			//TODO javascript CSS selector 		
 		}
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index fc3fe9146..cc64fd9c1 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -319,7 +319,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 		$cbpost = $sql->db_getList();
 		$text .= "<div id='chatbox-posts-block'>\n";
 		
-		$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['start'], true, $sc);
+		$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['start'], false, $sc);
 		
 		foreach($cbpost as $cb)
 		{
@@ -327,7 +327,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 			$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['item'], false, $sc);
 		}
 		
-		$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['end'], true, $sc);
+		$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['end'], false, $sc);
 		
 		$text .= "</div>";
 	}
@@ -348,6 +348,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 
 
 
+
 $caption = (file_exists(THEME."images/chatbox_menu.png") ? "<img src='".THEME_ABS."images/chatbox_menu.png' alt='' /> ".CHATBOX_L2 : CHATBOX_L2);
 
 if($pref['cb_layer'] == 1)