diff --git a/class2.php b/class2.php
index 883eccb4b..6036be563 100644
--- a/class2.php
+++ b/class2.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/class2.php,v $
-|     $Revision: 1.50 $
-|     $Date: 2008-03-11 01:47:01 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.51 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 //
@@ -1205,7 +1205,7 @@ function init_session() {
 
 	define('USERIP', $e107->getip());
 
-    if($_E107['cli'] && $_SERVER['argv'][1])
+    if(isset($_E107['cli']) && $_SERVER['argv'][1])
 	{
 		require_once(e_HANDLER."cli_class.php");
 		$cli = new eCLI;
@@ -1218,7 +1218,7 @@ function init_session() {
 		}
 	}
 
-	if (!isset($_COOKIE[$pref['cookie_name']]) && !isset($_SESSION[$pref['cookie_name']]) && !$_E107['cli'])
+	if (!isset($_COOKIE[$pref['cookie_name']]) && !isset($_SESSION[$pref['cookie_name']]) && !isset($_E107['cli']))
 	{
 		define("USER", FALSE);
 		define("USERTHEME", FALSE);
@@ -1229,7 +1229,7 @@ function init_session() {
 	}
 	else
 	{
-		if(!$_E107['cli'])
+		if(!isset($_E107['cli']))
 		{
 			list($uid, $upw)=(isset($_COOKIE[$pref['cookie_name']]) && $_COOKIE[$pref['cookie_name']] ? explode(".", $_COOKIE[$pref['cookie_name']]) : explode(".", $_SESSION[$pref['cookie_name']]));
         }
@@ -1552,14 +1552,14 @@ class error_handler {
 		// This is initialized before the current debug level is known
 		//
         global $_E107;
-        if($_E107['debug'])
+        if(isset($_E107['debug']))
 		{
 			$this->debug = true;
 			error_reporting(E_ALL);
 			return;
         }
 
-        if($_E107['cli'])
+        if(isset($_E107['cli']))
 		{
          	error_reporting(E_ALL ^ E_NOTICE);
 			return;
diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 20d7feb20..7b616c41d 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -12,9 +12,9 @@
 | GNU General Public License (http://gnu.org).
 |
 | $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $
-| $Revision: 1.12 $
-| $Date: 2008-03-02 21:08:31 $
-| $Author: e107steved $
+| $Revision: 1.13 $
+| $Date: 2008-03-13 19:15:56 $
+| $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -182,7 +182,7 @@ class e_shortcode
 
 			if(E107_DBG_SC)
 			{
-				echo ($scFile) ? "<br />sc_file= ".str_replace(e_FILE."shortcode/","",$scFile)."<br />" : "";
+				echo (isset($scFile)) ? "<br />sc_file= ".str_replace(e_FILE."shortcode/","",$scFile)."<br />" : "";
 				echo "<br />sc= <b>$code</b>";
 			}
 
diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php
index 59b3eef7d..9349f21bc 100644
--- a/e107_handlers/xml_class.php
+++ b/e107_handlers/xml_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/xml_class.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-02-01 14:11:27 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.6 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -129,7 +129,7 @@ class xmlClass
 		}
 		$xml = false;
 
-		if(strpos($filename, '://') !== false)
+		if(strpos($fname, '://') !== false)
 		{
 			$this->getRemoteFile($fname);
 		}
diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php
index 697cee6ca..4485ae5ea 100644
--- a/e107_plugins/login_menu/login_menu.php
+++ b/e107_plugins/login_menu/login_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-02-06 00:23:28 $
-|     $Author: secretr $
+|     $Revision: 1.9 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -123,7 +123,7 @@ if (USER == TRUE || ADMIN == TRUE)
 		
 		// ------------ Enable stats / other ---------------
 		
-		$menu_data['enable_stats'] = $menu_data || $menu_pref['login_menu']['external_stats'] ? true : false;
+		$menu_data['enable_stats'] = $menu_data || varsettrue($menu_pref['login_menu']['external_stats']) ? true : false;
 		$menu_data['new_total'] = $new_total + login_menu_class::get_stats_total();
 		$menu_data['link_bullet'] = $bullet;
 		$menu_data['link_bullet_src'] = $bullet_src;
diff --git a/e107_plugins/login_menu/login_menu_class.php b/e107_plugins/login_menu/login_menu_class.php
index c38c8b7c9..2f6baf710 100644
--- a/e107_plugins/login_menu/login_menu_class.php
+++ b/e107_plugins/login_menu/login_menu_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_class.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-02-06 00:23:28 $
-|     $Author: secretr $
+|     $Revision: 1.4 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -97,8 +97,8 @@ class login_menu_class
         $lbox_admin = varsettrue($eplug_admin, false);
         $coreplugs = login_menu_class::get_coreplugs(); 
         
-        $lprefs = $menu_pref['login_menu']['external_links'] ? explode(',', $menu_pref['login_menu']['external_links']) : array();
-        $sprefs = $menu_pref['login_menu']['external_stats'] ? explode(',', $menu_pref['login_menu']['external_stats']) : array();
+        $lprefs = varsettrue($menu_pref['login_menu']['external_links']) ? explode(',', $menu_pref['login_menu']['external_links']) : array();
+        $sprefs = varsettrue($menu_pref['login_menu']['external_stats']) ? explode(',', $menu_pref['login_menu']['external_stats']) : array();
         
         if($active) {
             $tmp =  array_flip($lprefs);
diff --git a/e107_plugins/tree_menu/tree_menu.php b/e107_plugins/tree_menu/tree_menu.php
index 6d6393a92..d5ea19067 100644
--- a/e107_plugins/tree_menu/tree_menu.php
+++ b/e107_plugins/tree_menu/tree_menu.php
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/tree_menu/tree_menu.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2008-03-04 22:14:00 $
-|     $Author: e107steved $
+|     $Revision: 1.5 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -95,8 +95,8 @@ foreach($mainLinkArray as $links) {
 		$url = "javascript:void(0);";
 		$spanName = $id;
 		$image = ($image ? "<img src='".e_IMAGE_ABS."icons/".$image."' alt='' style='vertical-align:middle;' />" : "&raquo;");
-		$plink = "<div".($menu_pref['tm_class2'] ? " class='{$menu_pref['tm_class2']}'" : "")." style='width:100%; cursor: pointer;' onclick='expandit(\"span_".$spanName."\");updatecook(\"".$spanName."\");'>".$image." ".setLink($name, $url, $openMethod, $description)."</div>\n";
-		$text .= ($menu_pref['tm_spacer'] ? "<div class='spacer'>\n".$plink."\n</div>\n" : $plink);
+		$plink = "<div".(varsettrue($menu_pref['tm_class2']) ? " class='{$menu_pref['tm_class2']}'" : "")." style='width:100%; cursor: pointer;' onclick='expandit(\"span_".$spanName."\");updatecook(\"".$spanName."\");'>".$image." ".setLink($name, $url, $openMethod, $description)."</div>\n";
+		$text .= (varsettrue($menu_pref['tm_spacer']) ? "<div class='spacer'>\n".$plink."\n</div>\n" : $plink);
 	} else {
 		// no sublinks found ...
 		if($links['name'])
@@ -104,8 +104,8 @@ foreach($mainLinkArray as $links) {
 			$linkName = $url;
 			$spanName = "";
 			$image = ($image ? "<img src='".e_IMAGE_ABS."icons/".$image."' alt='' style='vertical-align:middle;' />" : "&middot;");
-			$plink = "<div".($menu_pref['tm_class1'] ? " class='{$menu_pref['tm_class1']}'" : "")." style='width:100%; cursor: pointer;'>".$image." ".setLink($name, $url, $openMethod, $description)."</div>";
-			$text .= ($menu_pref['tm_spacer'] ? "<div class='spacer'>\n".$plink."\n</div>\n" : $plink);
+			$plink = "<div".(varsettrue($menu_pref['tm_class1']) ? " class='{$menu_pref['tm_class1']}'" : "")." style='width:100%; cursor: pointer;'>".$image." ".setLink($name, $url, $openMethod, $description)."</div>";
+			$text .= (varsettrue($menu_pref['tm_spacer']) ? "<div class='spacer'>\n".$plink."\n</div>\n" : $plink);
 		}
 	}
 
@@ -119,7 +119,7 @@ foreach($mainLinkArray as $links) {
 			$spanName = $parent_name;
 
 			$plink = $image." ".setLink($name, $url, $openMethod, $description)."<br />\n";
-			$text .=($menu_pref['tm_class3'] ? "<span".($menu_pref['tm_class3'] ? " class='{$menu_pref['tm_class3']}'" : "").">".$plink."</span>\n\n" : $plink);
+			$text .=(varsettrue($menu_pref['tm_class3']) ? "<span".(varsettrue($menu_pref['tm_class3']) ? " class='{$menu_pref['tm_class3']}'" : "").">".$plink."</span>\n\n" : $plink);
 		}
 		$text .= "</span>\n";
 	}
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php
index 4e34680a1..4aa558da7 100644
--- a/e107_themes/templates/header_default.php
+++ b/e107_themes/templates/header_default.php
@@ -6,9 +6,9 @@
 |     Released under the terms and conditions of the GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
-|     $Revision: 1.19 $
-|     $Date: 2008-01-27 11:02:34 $
-|     $Author: e107coders $
+|     $Revision: 1.20 $
+|     $Date: 2008-03-13 19:15:56 $
+|     $Author: lisa_ $
 +-----------------------------------------------------------------------------------------------+
 */
 
@@ -99,7 +99,7 @@ if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset(
 	define("e_WYSIWYG",FALSE);
 }
 // Load Plugin Header Files
-if (is_array($pref['e_header_list']))
+if (varset($pref['e_header_list']) && is_array($pref['e_header_list']))
 {
 	foreach($pref['e_header_list'] as $val)
 	{