diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 3769d2c73..956baa0dd 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/menus.php,v $
-|     $Revision: 1.23 $
-|     $Date: 2009-07-09 11:37:36 $
+|     $Revision: 1.24 $
+|     $Date: 2009-07-10 14:27:30 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -23,970 +23,1097 @@ if (!getperms("2"))
 	exit;
 }
 $e_sub_cat = 'menus';
-require_once("auth.php");
-require_once(e_HANDLER."form_handler.php");
+
+
 require_once(e_HANDLER."file_class.php");
-$frm = new form;
+require_once(e_HANDLER."form_handler.php");
+
+
+	$frm = new form;
+	$men = new menuManager(1);   // use 1 for dragdrop.
+	$menu->debug = FALSE;
+
+
+
+
+  if(isset($_GET['ajax']))
+  {
+  	$men->menuSaveAjax();
+	exit;
+  }
+
+require_once("auth.php");
+
+
+
+
+
 
 if($_POST)
 {
-//	print_a($_POST);
+ //	print_a($_POST);
 //	exit;
 	$e107cache->clear_sys("menus_");
 }
 
-	$tmp = explode('.', e_QUERY);
-	$curLayout = ($tmp[1]) ? $tmp[1] : $pref['sitetheme_deflayout'] ;
-
-  if(isset($_POST['custom_select']))
-  {
-	$curLayout =  $_POST['custom_select'];
-  }
 
 
-   // Almost the same code as found in templates/header_default.php  ---------
-
-
-	if(($curLayout == 'legacyCustom' || $curLayout=='legacyDefault') && (isset($CUSTOMHEADER) || isset($CUSTOMFOOTER)) )  // 0.6 themes.
-	{
-	 	if($curLayout == 'legacyCustom')
+		if ($message != "")
 		{
-			$HEADER = ($CUSTOMHEADER) ? $CUSTOMHEADER : $HEADER;
-			$FOOTER = ($CUSTOMFOOTER) ? $CUSTOMFOOTER : $FOOTER;
-		}
-	}
-	elseif($curLayout && $curLayout != "legacyCustom" && (isset($CUSTOMHEADER[$curLayout]) || isset($CUSTOMHEADER[$curLayout]))) // 0.7 themes
-	{
-	  //	echo " MODE 0.7";
-		$HEADER = ($CUSTOMHEADER[$curLayout]) ? $CUSTOMHEADER[$curLayout] : $HEADER;
-		$FOOTER = ($CUSTOMFOOTER[$curLayout]) ? $CUSTOMFOOTER[$curLayout] : $FOOTER;
-	}
-    elseif($curLayout && isset($HEADER[$curLayout]) && isset($FOOTER[$curLayout])) // 0.8 themes - we use only $HEADER and $FOOTER arrays.
-	{
-	  //	echo " MODE 0.8";
-		$HEADER = $HEADER[$curLayout];
-		$FOOTER = $FOOTER[$curLayout];
-	}
-
-    // ------------------------------------------------------------------------
-
-
-	$layouts_str = $HEADER.$FOOTER;
-
-
-	if ($NEWSHEADER)
-	{
-		$layouts_str .= $NEWSHEADER;
-	}
-
-	$menu_array = parseheader($layouts_str, 'check');
-
-
-	sort($menu_array, SORT_NUMERIC);
-	$menu_check = 'set';
-	foreach ($menu_array as $menu_value)
-	{
-		if ($menu_value != $menu_check)
-		{
-			$menu_areas[] = $menu_value;
-		}
-		$menu_check = $menu_value;
-	}
-
-	// Cams Bit ----------- Activate Multiple Menus ---
-	if($_POST['menuActivate'])
-	{
-		menuActivate();
-
-	}
-
-	if($_POST['menuSetCustomPages'])
-	{
-		menuSetCustomPages($_POST['custompages']);
-	}
-
-	if(isset($_POST['menuUsePreset']) && $_POST['curLayout'])
-	{
-
-		menuSetPreset();
-	}
-
-
-	if (isset($_POST['menuAct']))
-	{
-	  foreach ($_POST['menuAct'] as $k => $v)
-	  {
-		if (trim($v))
-		{
-		  $id = $k;
-		  list($menu_act, $location, $position, $newloc) = explode(".", $_POST['menuAct'][$k]);
-		}
-	  }
-	}
-
-	if ($menu_act == 'config')
-	{
-		if($newloc)
-		{
-			$newloc = ".".$newloc;
-		}
-		$newurl = $PLUGINS_DIRECTORY.$location."/{$position}{$newloc}.php";
-		$newurl = SITEURL.str_replace("//", "/", $newurl);
-		echo "<script type='text/javascript'>	top.location.href = '{$newurl}'; </script> ";
-		exit;
-	}
-
-	if ($menu_act == "adv")
-	{
-		menuVisibilityOptions();
-	}
-
-
-
-	unset($message);
-
-	if ($menu_act == "sv")
-	{
-		menuSaveVisibility();
-
-	}
-
-	if ($menu_act == "move")
-	{
-	 	menuMove();
-	}
-
-	if ($menu_act == "deac")
-	{
-	 	menuDeactivate();
-	}
-
-	if ($menu_act == "bot")
-	{
-		$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location='{$location}' AND menu_layout = '$curLayout'  ");
-		$sql->db_Update("menus", "menu_order=".($menu_count+1)." WHERE menu_order='{$position}' AND menu_location='{$location}' AND menu_layout = '$curLayout'  ");
-		$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location='{$location}' AND menu_order > {$position} AND menu_layout = '$curLayout' ");
-		$admin_log->log_event('MENU_06',$location.'[!br!]'.$position.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-	}
-
-	if ($menu_act == "top")
-	{
-		$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_location='{$location}' AND menu_order < {$position} AND menu_layout = '$curLayout' ");
-		$sql->db_Update("menus", "menu_order=1 WHERE menu_id='{$id}' ");
-		$admin_log->log_event('MENU_05',$location.'[!br!]'.$position.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-	}
-
-	if ($menu_act == "dec")
-	{
-		$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_order='".($position+1)."' AND menu_location='{$location}' AND menu_layout = '$curLayout' ");
-		$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_id='{$id}' AND menu_location='{$location}' AND menu_layout = '$curLayout' ");
-		$admin_log->log_event('MENU_08',$location.'[!br!]'.$position.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-	}
-
-	if ($menu_act == "inc")
-	{
-		$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_order='".($position-1)."' AND menu_location='{$location}' AND menu_layout = '$curLayout' ");
-		$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_id='{$id}' AND menu_location='{$location}' AND menu_layout = '$curLayout' ");
-		$admin_log->log_event('MENU_07',$location.'[!br!]'.$position.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-	}
-
-	if (strpos(e_QUERY, 'configure') === FALSE)
-	{  // Scan plugin directories to see if menus to add
-	    menuScanMenus();
-	}
-
-	if ($message != "")
-	{
-		echo $ns -> tablerender('Updated', "<div style='text-align:center'><b>".$message."</b></div><br /><br />");
-	}
-
-
-	if (strpos(e_QUERY, 'configure') === FALSE)
-	{
-		$cnt = $sql->db_Select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar.
-		$text = "<iframe id='menu_iframe' src='".e_SELF."?configure.$curLayout' width='100%' style='width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' frameborder='0' scrolling='auto' ></iframe>";
-	   	$ns -> tablerender(MENLAN_35, $text, 'menus_config');
-	}
-	else // Within the IFrame.
-	{
-
-	    echo menuSelectLayout();
-		menuRenderPage();
-
-	}
-
-
-
-
-// ----------------------------------------------------------------------------
-
-function menuSetPreset()
-{
-	global $pref,$sql,$location,$admin_log;
-	$layout = ($_POST['curLayout'] != $pref['sitetheme_deflayout']) ? $_POST['curLayout'] : "";
-    $menuAreas = getMenuPreset($_POST['curLayout']);
-
-    $sql->db_Update("menus", "menu_location='0' WHERE menu_layout = '$layout' "); // Clear All existing.
-	foreach($menuAreas as $val)
-	{
-
-		if($sql->db_Select("menus", 'menu_name, menu_path' , "menu_name = '".$val['menu_name']."' LIMIT 1"))
-		{
-			$row=$sql->db_Fetch();
-
-        	if(!$sql->db_Update('menus', "menu_order='{$val['menu_order']}', menu_location = ".$val['menu_location'].", menu_class= ".$val['menu_class']." WHERE menu_name='".$val['menu_name']."' AND menu_layout = '$layout' LIMIT 1 "))
-			{
- 				$qry = "
-				INSERT into #menus
-				(`menu_name`, `menu_location`, `menu_order`, `menu_pages`,`menu_class`, `menu_path`, `menu_layout`)
-				VALUES ('{$val['menu_name']}', {$val['menu_location']}, {$val['menu_order']}, '', '{$val['menu_class']}',  '{$row['menu_path']}', '{$layout}')
-				";
-				$sql->db_Select_gen($qry);
-			  	$admin_log->log_event('MENU_01',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$menu_count.'[!br!]'.$row['menu_path'],E_LOG_INFORMATIVE,'');
-
-			}
-         }
-	}
-
-}
-
-
-// ----------------------------------------------------------------------------
-
-function menuScanMenus()
-{
-	global $sql, $sql2, $menu_areas;
-
-		$efile = new e_file;
-		$efile->dirFilter = array('/', 'CVS', '.svn', 'languages');
-		$fileList = $efile->get_files(e_PLUGIN,"_menu\.php$",'standard',2);
-		foreach($fileList as $file)
-		{
-		  list($parent_dir) = explode('/',str_replace(e_PLUGIN,"",$file['path']));
-		  $file['path'] = str_replace(e_PLUGIN,"",$file['path']);
-		  $file['fname'] = str_replace(".php","",$file['fname']);
-		  $valid_menu = FALSE;
-		  $existing_menu = $sql->db_Count("menus", "(*)", "WHERE menu_name='{$file['fname']}'");
-		  if (file_exists(e_PLUGIN.$parent_dir."/plugin.xml") ||
-			file_exists(e_PLUGIN.$parent_dir."/plugin.php"))
-		  {
-	//		include(e_PLUGIN.$parent_dir."/plugin.php");
-			if (isset($pref['plug_installed'][$parent_dir]))
-	//		if ($sql->db_Select("plugin", "*", "plugin_path='".$eplug_folder."' AND plugin_installflag='1' "))
-			{  // Its a 'new style' plugin with a plugin.php file, or an even newer one with plugin.xml file - only include if plugin installed
-			  $valid_menu = TRUE;		// Whether new or existing, include in list
-			}
-		  }
-		  else
-		  {  // Just add the menu anyway
-			  $valid_menu = TRUE;
-		  }
-		  if ($valid_menu)
-		  {
-		    $menustr .= "&".str_replace(".php", "", $file['fname']);
-			if (!$existing_menu)
-			{  // New menu to add to list
-				  if($sql->db_Insert("menus", " 0, '{$file['fname']}', 0, 0, 0, '' ,'{$file['path']}', ''"))
-				  {
-				  		// Could do admin logging here - but probably not needed
-				  	$message .= "<b>".MENLAN_10." - ".$file['fname']."</b><br />";
-				  }
-			}
-		  }
+			echo $ns -> tablerender('Updated', "<div style='text-align:center'><b>".$message."</b></div><br /><br />");
 		}
 
-		//Reorder all menus into 1...x order
-		if (!is_object($sql2)) $sql2 = new db;		// Shouldn't be needed
-		foreach ($menu_areas as $menu_act)
+
+		if (strpos(e_QUERY, 'configure') === FALSE)
 		{
-			if ($sql->db_Select("menus", "menu_id", "menu_location={$menu_act} ORDER BY menu_order ASC"))
-			{
-				$c = 1;
-				while ($row = $sql->db_Fetch())
-				{
-					$sql2->db_Update("menus", "menu_order={$c} WHERE menu_id=".$row['menu_id']);
-					$c++;
-				}
-			}
+			$cnt = $sql->db_Select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar.
+			$text = "<iframe id='menu_iframe' src='".e_SELF."?configure.$curLayout' width='100%' style='width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' frameborder='0' scrolling='auto' ></iframe>";
+		   	$ns -> tablerender(MENLAN_35, $text, 'menus_config');
 		}
-
-		$sql->db_Select("menus", "*", "menu_path NOT REGEXP('[0-9]+') ");
-		while (list($menu_id, $menu_name, $menu_location, $menu_order) = $sql->db_Fetch(MYSQL_NUM))
+		else // Within the IFrame.
 		{
-			if (stristr($menustr, $menu_name) === FALSE)
-			{
-				$sql2->db_Delete("menus", "menu_name='$menu_name'");
-				$message .= "<b>".MENLAN_11." - ".$menu_name."</b><br />";
-			}
+
+        		echo "<div>
+                e_QUERY = ".e_QUERY."<br />
+				curLayout = ".$men->curLayout."<br />
+				dbLayout   = ".$men->dbLayout."<br />
+				</div>";
+
+
+		    echo $men->menuSelectLayout();
+		  	$men->menuRenderPage();
+
 		}
 
-		echo $message;
-}
-
-// ---------------------------------------------------------------------------
-
-function menuVisibilityOptions()
-{
-	global $sql,$ns,$id,$curLayout;
-	require_once(e_HANDLER."userclass_class.php");
-	$sql->db_Select("menus", "*", "menu_id=".$id);
-	$row = $sql->db_Fetch();
-	$listtype = substr($row['menu_pages'], 0, 1);
-	$menu_pages = substr($row['menu_pages'], 2);
-	$menu_pages = str_replace("|", "\n", $menu_pages);
-
-	$text = "<div style='text-align:center;'>
-	<form  method='post' action='".e_SELF."?configure.".$curLayout."'>
-	<table style='width:40%'>
-	<tr>
-	<td>
-	<input type='hidden' name='menuAct[{$row['menu_id']}]' value='sv.{$row['menu_id']}' />
-	".MENLAN_4." ".
-	r_userclass('menu_class', $row['menu_class'], "off", "public,member,guest,admin,main,classes,nobody")."
-	</td>
-	</tr>
-	<tr><td><br />";
-	$checked = ($listtype == 1) ? " checked='checked' " : "";
-	$text .= "<input type='radio' {$checked} name='listtype' value='1' /> ".MENLAN_26."<br />";
-	$checked = ($listtype == 2) ? " checked='checked' " : "";
-	$text .= "<input type='radio' {$checked} name='listtype' value='2' /> ".MENLAN_27."<br /><br />".MENLAN_28."<br />";
-	$text .= "<textarea name='pagelist' cols='60' rows='10' class='tbox'>$menu_pages</textarea>";
-	$text .= "
-	<tr>
-	<td style='text-align:center'><br />
-	<input class='button' type='submit' name='class_submit' value='".MENLAN_6."' />
-	</td>
-	</tr>
-	</table>
-	</form>
-	</div>";
-	$caption = MENLAN_7." ".$row['menu_name'];
-	$ns->tablerender($caption, $text);
-}
-
-
-
 // -----------------------------------------------------------------------------
 
+class menuManager{
 
-function menuActivate()
-{
-	global $sql, $admin_log, $pref;
 
-	$location = key($_POST['menuActivate']);
+        var $menu_areas = array();
+        var $curLayout;
+        var $menuId;
+		var $menuNewLoc;
+		var $dragDrop;
+		var $menuActivateLoc;
+        var $menuActivateIds;
+		var $debug;
 
-    $layout = ($_POST['curLayout'] != $pref['sitetheme_deflayout']) ? $_POST['curLayout'] : "";
-
-	$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location=".$location." AND menu_layout = '$layout' ");
-
-	foreach($_POST['menuselect'] as $sel_mens)
-	{
-		//Get info from menu being activated
-		if($sql->db_Select("menus", 'menu_name, menu_path' , "menu_id = ".$sel_mens." "))
+		function menuManager($dragdrop=FALSE)
 		{
-			$row=$sql->db_Fetch();
-			//If menu is not already activated in that area, add the record.
+        		global $pref, $HEADER,$FOOTER, $NEWSHEADER;
 
-			if(!$sql->db_Select('menus', 'menu_name,menu_path', " menu_name='".$row['menu_name']."' AND menu_layout = '$layout' AND menu_location = ".$location." LIMIT 1 "))
-			{
-				$qry = "
-				INSERT into #menus
-				(`menu_name`, `menu_location`, `menu_order`, `menu_pages`, `menu_path`, `menu_layout`)
-				VALUES ('{$row['menu_name']}', {$location}, {$menu_count}, '', '{$row['menu_path']}', '{$layout}')
-				";
-				$sql->db_Select_gen($qry);
-				$admin_log->log_event('MENU_01',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$menu_count.'[!br!]'.$row['menu_path'],E_LOG_INFORMATIVE,'');
-				$menu_count++;
-			}
-		}
-	}
-}
-
-
-
-// -----------------------------------------------------------------------------
-
-
-function menuSetCustomPages($array)
-{
-	global $pref;
-	$key = key($array);
-	$pref['sitetheme_custompages'][$key] = array_filter(explode(" ",$array[$key]));
-	save_prefs();
-}
-
-
-// ------------------------------------------------------------------------------
-
-function getMenuPreset($layout)
-{
-	global $pref;
-
- //	print_a($pref['sitetheme_layouts'][$layout]['menuPresets']);
-    if(!isset($pref['sitetheme_layouts'][$layout]['menuPresets']))
-	{
-    	return;
-	}
-
-	$temp = $pref['sitetheme_layouts'][$layout]['menuPresets']['area'];
-
-	foreach($temp as $key=>$val)
-	{
-		$iD = $val['@attributes']['id'];
-		foreach($val['menu'] as $k=>$v)
-		{
-			$uclass = (defined(trim($v['@attributes']['userclass']))) ? constant(trim($v['@attributes']['userclass'])) : 0;
-			$menuArea[] = array(
-				'menu_location' => $iD,
-				'menu_order'	=> $k,
-				'menu_name'		=> $v['@attributes']['name']."_menu",
-				'menu_class'	=> intval($uclass)
-			);
-		}
-	}
-
-    return $menuArea;
-
-}
-
-
-// ------------------------------------------------------------------------------
-
-function checkMenuPreset($array,$name)
-{
-	if(!is_array($array))
-	{
-    	return;
-	}
-	foreach($array as $key=>$val)
-	{
-        if($val['menu_name']==$name)
-		{
-			return $val['menu_location'];
-		}
-	}
-
-    return FALSE;
-}
-
-
-
-// --------------------------------------------------------------------------
-
-function menuSaveVisibility()
-{
-	global $sql, $admin_log,$id;
-	$pagelist = explode("\r\n", $_POST['pagelist']);
-	for ($i = 0 ; $i < count($pagelist) ; $i++)
-	{
-		$pagelist[$i] = trim($pagelist[$i]);
-	}
-	$plist = implode("|", $pagelist);
-	$pageparms = $_POST['listtype'].'-'.$plist;
-	$pageparms = preg_replace("#\|$#", "", $pageparms);
-	$pageparms = (trim($_POST['pagelist']) == '') ? '' : $pageparms;
-
-	if($sql->db_Update("menus", "menu_class='".$_POST['menu_class']."', menu_pages='{$pageparms}' WHERE menu_id=".intval($id)))
-	{
-		$admin_log->log_event('MENU_02',$_POST['menu_class'].'[!br!]'.$pageparms.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-		$message = "<br />".MENLAN_8."<br />";
-	}
-	else
-	{
-     	$message = "the update failed";
-
-	}
-
-    echo $message;
-
-}
-
-
-
-// -----------------------------------------------------------------------
-
-function menuDeactivate()
-{	// Get current menu name
-	global $sql,$admin_log,$id,$curLayout;
-
-	if($sql->db_Select('menus', 'menu_name', 'menu_id='.$id, 'default'))
-	{
-		$row = $sql->db_Fetch();
-		//Check to see if there is already a menu with location = 0 (to maintain BC)
-		if($sql->db_Select('menus', 'menu_id', "menu_name='{$row['menu_name']}' AND menu_location = 0 AND menu_layout ='".$curLayout."' LIMIT 1"))
-		{
-			//menu_location=0 already exists, we can just delete this record
-			$sql->db_Delete('menus', 'menu_id='.$id);
-		}
-		else
-		{
-			//menu_location=0 does NOT exist, let's just convert this to it
-			if(!$sql->db_Update("menus", "menu_location=0, menu_order=0, menu_class=0, menu_pages='' WHERE menu_id=".$id))
-			{
-            	$message = "FAILED";
-			}
-		}
-		//Move all other menus up
-		$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location={$location} AND menu_order > {$position} AND menu_layout = '".$curLayout."' ");
-		$admin_log->log_event('MENU_04',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$position.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-	}
-
-	echo $message;
-}
-
-
-// ----------------------------------------------------------------------
-
-function menuMove()
-{// Get current menu name
-
-		global $id,$admin_log,$sql,$newloc, $curLayout;
-
-		if($sql->db_Select('menus', 'menu_name', 'menu_id='.$id, 'default'))
-		{
-			$row = $sql->db_Fetch();
-			//Check to see if menu is already active in the new area, if not then move it
-			if(!$sql->db_Select('menus', 'menu_id', "menu_name='{$row['menu_name']}' AND menu_location = ".$newloc." AND menu_layout='".$curLayout ."' LIMIT 1"))
-			{
-				$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location=".$newloc);
-				$sql->db_Update("menus", "menu_location='{$newloc}', menu_order=".($menu_count+1)." WHERE menu_id=".$id);
-				$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location='{$location}' AND menu_order > {$position} AND menu_layout='".$curLayout ."' ");
-			}
-			$admin_log->log_event('MENU_03',$row['menu_name'].'[!br!]'.$newloc.'[!br!]'.$id,E_LOG_INFORMATIVE,'');
-		}
-}
-
-
-// =-----------------------------------------------------------------------------
-
-
-function menuRenderPage()
-{
-	global $sql, $ns, $HEADER, $FOOTER, $frm, $curLayout, $pref, $tp, $menu_areas;
-
-	parseheader($HEADER);  // $layouts_str;
-
-	$layout = ($curLayout) ? $curLayout : $pref['sitetheme_deflayout'];
-	$menuPreset = getMenuPreset($layout);
-
-
-	echo "<div style='text-align:center'>";
-	echo $frm->form_open("post", e_SELF."?configure.".$curLayout, "menuActivation");
-	$text = "<table style='width:80%;margin-left:auto;margin-right:auto'>";
-
- 	$sql->db_Select("menus", "menu_name, menu_id, menu_pages", "1 GROUP BY menu_name ORDER BY menu_name ASC");
-	$text .= "<tr><td style='width:50%;text-align:center;padding-bottom:4px'>".MENLAN_36."...</td><td style='width:50%;padding-bottom:4px;text-align:center'>...".MENLAN_37."</td></tr>";
-	$text .= "<tr><td style='width:50%;vertical-align:top;text-align:center'>";
-
-
-	$text .= "<div style='border:1px inset black;height:200px;display:block;overflow:auto;margin-bottom:20px'>
-	<table style='width:100%;margin-left:auto;margin-right:auto' cellspacing='0' cellpadding='0'>\n";
-	while ($row = $sql->db_Fetch())
-	{
-		$pdeta = "";
-        $color = ($color == "white") ? "#DDDDDD" : "white";
-		if($row['menu_pages'] == "dbcustom")
-		{
-			$pdeta = MENLAN_42;
-		}
-		else
-		{
-			$row['menu_name'] = preg_replace("#_menu$#i", "", $row['menu_name']);
-            if($pnum = checkMenuPreset($menuPreset,$row['menu_name']."_menu"))
-			{
-	        	$pdeta = MENLAN_39." {$pnum}";
-			}
-		}
-
-
-		$text .= "<tr style='background-color:$color;color:black'>
-			<td style='text-align:left; color:black;'><input type='checkbox' name='menuselect[]' value='{$row['menu_id']}' />".$row['menu_name']."</td>
-            <td style='color:black'> ".$pdeta."&nbsp;</td>
-			</tr>\n";
-
-	}
-	$text .= "</table></div>";
-
-	$text .= "</td><td style='width:50%;vertical-align:top;text-align:center'><br />";
-	foreach ($menu_areas as $menu_act)
-	{
-		$text .= "<input type='submit' class='button' id='menuActivate_".trim($menu_act)."' name='menuActivate[".trim($menu_act)."]' value='".MENLAN_13." ".trim($menu_act)."' /><br /><br />\n";
-	}
-
-
-    if($layout)
-	{
-		if(isset($pref['sitetheme_layouts'][$layout]['menuPresets']))
-		{
-	    	$text .= "<input type='submit' class='button' name='menuUsePreset' value=\"".MENLAN_40."\" onclick=\"return jsconfirm('".$tp->toJS(MENLAN_41)."')\" /><br /><br />\n";  // Use Menu Presets
-			$text .= "<input type='hidden' name='menuPreset' value='".$layout."' />";
-		}
-		$text .= "<input type='hidden' name='curLayout' value='".$layout."' />";
-    }
-
-	$text .= "</td>";
-
-	$text .= "</tr></table>";
-	echo $ns -> tablerender(MENLAN_22, $text);
-	echo $frm->form_close();
-	echo "</div>";
-
-	parseheader($FOOTER);
-}
-
-
-
-
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
-function menuSelectLayout()
-{
-	global $frm, $curLayout, $pref, $HEADER,  $CUSTOMHEADER, $CUSTOMFOOTER, $CUSTOMPAGES;
-
-	$text .= "<form  method='post' action='".e_SELF."?configure.".$curLayout."'>";
-	$text .= "<div style='color:white;background-color:black;width:98%;display:block;padding:15px;text-align:center'>".MENLAN_30." ";
-    $text .= "<select style='color:black' name='custom_select' onchange=\"this.form.submit()\">\n";
-
-    $search = array("_","legacyDefault","legacyCustom");
-	$replace = array(" ",MENLAN_31,MENLAN_33);
-
-
-    foreach($pref['sitetheme_layouts'] as $key=>$val)
-	{
-		$layoutName = str_replace($search,$replace,$key);
-		$layoutName .=($key==$pref['sitetheme_deflayout']) ? " (".MENLAN_31.")" : "";
-		$selected = ($curLayout == $key || ($key==$pref['sitetheme_deflayout'] && $curLayout=='')) ? "selected" : FALSE;
-    	$text .= "<option value='$key' {$selected}>".$layoutName."</option>";
-	}
-
-    $text .= "</select></div></form>";
-	  return $text;
-
-
-	if(is_array($HEADER))
-	{
-        foreach($HEADER as $key=>$val)
-		{
-			$default = ($curLayout == $key || $curLayout == 'default_layout' ) ? "selected" : FALSE;
-			$deftext = ($key==$pref['sitetheme_deflayout']) ? " (".MENLAN_31.")" : "";
-			$diz = str_replace("_"," ",$key);
-        	$text .= $frm->form_option(ucwords($diz).$deftext, $default, $key);
- 		}
-	}
-	else
-	{
-    	$text .= $frm->form_option(MENLAN_31, '', '');
-	}
-
-    if($CUSTOMHEADER && !is_array($CUSTOMHEADER))
-	{
-    	$CUSTOMHEADER = array('legacyCustom'=>$CUSTOMHEADER);
-	}
-
-	if($CUSTOMFOOTER && !is_array($CUSTOMFOOTER))
-	{
-    	$CUSTOMFOOTER = array('legacyCustom'=> $CUSTOMFOOTER);
-
-	}
-
-	if(is_array($CUSTOMHEADER) || is_array($CUSTOMFOOTER))
-	{
-		$customlist = (is_array($CUSTOMHEADER)) ? array_merge($CUSTOMHEADER,$CUSTOMFOOTER) : $CUSTOMFOOTER;
-        foreach($customlist as $key=>$val)
-		{
-			$selected = ($curLayout == $key || $curLayout == 'default_layout' ) ? "selected='selected'" : "";
-			$deftext = ($key==$pref['sitetheme_deflayout']) ? " (".MENLAN_31.")" : "";
-			$diz = ($key == "legacyCustom") ? MENLAN_33 : str_replace("_"," ",$key);
-			$text .= "<option value='$key' $selected style='color:black'>".ucwords($diz).$deftext."</option>\n";
-           //	$text .= $frm->form_option(ucwords($diz).$deftext, $default, $key);
- 		}
-	}
-
-
-
-     $text .= "</select>";
-
-    // TO-DO Saving of the custompage preference for each layout.
-   /*
-	if($curLayout && ($curLayout != $pref['sitetheme_deflayout']))
-	{
-
-		if(!isset($pref['sitetheme_custompages'][$curLayout]))
-		{
-        	if(isset($pref['sitetheme_layouts'][$curLayout]['customPages']))
-			{
-            	$custPages = $pref['sitetheme_layouts'][$curLayout]['customPages'];
-			}
-			elseif(isset($CUSTOMPAGES[$curLayout]) && $curLayout !='legacyCustom')
-			{
-            	$custPages = $CUSTOMPAGES[$curLayout];
-			}
-			elseif($CUSTOMPAGES)
-			{
-            	$custPages = $CUSTOMPAGES;
-
-			}
-
-		   	menuSetCustomPages(array($curLayout=>$custPages));
-		}
-		else
-		{
-        	$custPages = $pref['sitetheme_custompages'][$curLayout];
-		}
-
-    	$text .= "<div style='padding:10px'>Displays on these pages: <input type='text' style='width:80%;color:black;background-color:white' name='custompages[".$curLayout."]' value=\"".implode(" ",$custPages)."\" />
-        <input type='submit' name='menuSetCustomPages' value='".LAN_SAVE."' />
-		</div>";
-	}*/
-	 $text .= "</div>
-		</form>";
-	  return $text;
-
-}
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
-function parseheader($LAYOUT, $check = FALSE)
-{
-	global $curLayout;
-//  $tmp = explode("\n", $LAYOUT);
-// Split up using the same function as the shortcode handler
-  $tmp = preg_split('#(\{\S[^\x02]*?\S\})#', $LAYOUT, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-  for ($c = 0; $c < count($tmp); $c++)
-  {
-	if (preg_match("/[\{|\}]/", $tmp[$c]))
-	{
-	  if ($check)
-	  {
-		if (strstr($tmp[$c], "{MENU="))
-		{
-		  $str[] = preg_replace("/\{MENU=(.*?)(:.*?)?\}/si", "\\1", $tmp[$c]);
-		}
-	  }
-	  else
-	  {
-		checklayout($tmp[$c],$curLayout);
-	  }
-	}
-	else
-	{
-	  if (!$check)
-	  {
-		echo $tmp[$c];
-	  }
-	}
-  }
-  if ($check)
-  {
-	return $str;
-  }
-}
-
-function checklayout($str,$curLayout)
-{	// Displays a basic representation of the theme
-	global $pref, $menu_areas, $ns, $PLUGINS_DIRECTORY, $frm, $sc_style, $tp, $menu_order;
-
-    $menuLayout = ($curLayout != $pref['sitetheme_deflayout']) ? $curLayout : "";
-
-	if (strstr($str, "LOGO"))
-	{
-	  echo $tp -> parseTemplate("{LOGO}");
-	}
-	else if(strstr($str, "SITENAME"))
-	{
-	  echo "<div style='padding: 2px'>[SiteName]</div>";
-	}
-	else if (strstr($str, "SITETAG"))
-	{
-	  echo "<div style='padding: 2px'>[SiteTag]</div>";
-	}
-	else if (strstr($str, "SITELINKS"))
-	{
-	  echo "<div style='padding: 2px; text-align: center'>[SiteLinks]</div>";
-	}
-	else if (strstr($str, "LANGUAGELINKS"))
-	{
-	  echo "<div class=text style='padding: 2px; text-align: center'>[Language]</div>";
-	}
-	else if (strstr($str, "CUSTOM"))
-	{
-	  $cust = preg_replace("/\W*\{CUSTOM=(.*?)(\+.*)?\}\W*/si", "\\1", $str);
-	  echo "<div style='padding: 2px'>[".$cust."]</div>";
-	}
-	// Display embedded Plugin information.
-	else if (strstr($str, "PLUGIN"))
-	{
-		$plug = preg_replace("/\{PLUGIN=(.*?)\}/si", "\\1", $str);
-		$plug = trim($plug);
-		if (file_exists((e_PLUGIN."{$plug}/{$plug}_config.php")))
-		{
-		  $link = e_PLUGIN."{$plug}/{$plug}_config.php";
-		}
-
-		if(file_exists((e_PLUGIN.$plug."/config.php")))
-		{
-		  $link = e_PLUGIN.$plug."/config.php";
-		}
-
-		$plugtext = ($link) ? "(".MENLAN_34.":<a href='$link' title='".MENLAN_16."'>".MENLAN_16."</a>)" : "(".MENLAN_34.")" ;
-		echo "<br />";
-		$ns -> tablerender($plug, $plugtext);
-	}
-	else if (strstr($str, "MENU"))
-	{
-		$ns = new e107table;
-		$menu = preg_replace("/\{MENU=(.*?)(:.*?)?\}/si", "\\1", $str);
-		if (isset($sc_style['MENU']['pre']) && strpos($str, 'ret') !== false)
-		{
-		  echo $sc_style['MENU']['pre'];
-		}
-		echo "<div style='text-align:center; font-size:14px' class='fborder'><div class='forumheader'><b>".MENLAN_14."  ".$menu."</b></div></div><br />";
-		$text = "&nbsp;";
-		$sql9 = new db;
-		if ($sql9->db_Count("menus", "(*)", " WHERE menu_location='$menu' AND menu_layout = '$menuLayout' "))
-		{
-			unset($text);
-			echo $frm->form_open("post", e_SELF."?configure.".$curLayout, "frm_menu_".intval($menu));
-
-			$sql9->db_Select("menus", "*", "menu_location='$menu' AND menu_layout='$menuLayout' ORDER BY menu_order");
-			$menu_count = $sql9->db_Rows();
-			while (list($menu_id, $menu_name, $menu_location, $menu_order, $menu_class, $menu_pages, $menu_path) = $sql9->db_Fetch(MYSQL_NUM)) {
-				$menu_name = preg_replace("#_menu#i", "", $menu_name);
-				$vis = ($menu_class || strlen($menu_pages) > 1) ? " <span style='color:red'>*</span> " :
-				"";
-				$caption = "<div style='text-align:center'>{$menu_name}{$vis}</div>";
-				$menu_info = "{$menu_location}.{$menu_order}";
-
-				$text = "";
-				$conf = '';
-				if (file_exists(e_PLUGIN."{$menu_path}/{$menu_name}_menu_config.php"))
+                $this->dragDrop = $dragdrop;
+				if($this->dragDrop)
 				{
-				  $conf = "config.{$menu_path}.{$menu_name}_menu_config";
+                	$this->debug = TRUE;
 				}
 
-				if($conf == '' && file_exists(e_PLUGIN."{$menu_path}/config.php"))
+                if ($NEWSHEADER)
 				{
-				  $conf = "config.{$menu_path}.config";
+					$HEADER .= $NEWSHEADER;
 				}
 
-				$text .= "<select id='menuAct_$menu_id' name='menuAct[$menu_id]' class='tbox' onchange='this.form.submit()' >";
-				$text .= $frm->form_option(MENLAN_25, TRUE, " ");
-				$text .= $frm->form_option(MENLAN_15, "", "deac.{$menu_info}");
 
-				if ($conf) {
-					$text .= $frm->form_option(MENLAN_16, "", $conf);
+                if(isset($_POST['custom_select']))
+				{
+					$this->curLayout =  $_POST['custom_select'];
+				}
+				else
+				{
+                    $tmp = explode('.', e_QUERY);
+					$this->curLayout = ($tmp[1]) ? $tmp[1] : $pref['sitetheme_deflayout'];
 				}
 
-				if ($menu_order != 1) {
-					$text .= $frm->form_option(MENLAN_17, "", "inc.{$menu_info}");
-					$text .= $frm->form_option(MENLAN_24, "", "top.{$menu_info}");
+				$this->dbLayout = ($this->curLayout !=$pref['sitetheme_deflayout']) ? $this->curLayout : "";  //menu_layout is left blank when it's default.
+
+
+
+
+
+
+				$this->menuGrabLayout();
+
+	        	$menu_array = $this->parseheader($HEADER.$FOOTER, 'check');
+
+				sort($menu_array, SORT_NUMERIC);
+				$menu_check = 'set';
+				foreach ($menu_array as $menu_value)
+				{
+					if ($menu_value != $menu_check)
+					{
+				   		$this->menu_areas[] = $menu_value;
+					}
+					$menu_check = $menu_value;
 				}
-				if ($menu_count != $menu_order) {
-					$text .= $frm->form_option(MENLAN_18, "", "dec.{$menu_info}");
-					$text .= $frm->form_option(MENLAN_23, "", "bot.{$menu_info}");
+
+
+				$this->menuModify();
+
+            	if($_POST['menuActivate'])
+				{
+                    $this->menuActivateLoc = key($_POST['menuActivate']);
+					$this->menuActivateIds = $_POST['menuselect'];
+					$this->menuActivate();
+
 				}
-				foreach ($menu_areas as $menu_act) {
-					if ($menu != $menu_act) {
-						$text .= $frm->form_option(MENLAN_19." ".$menu_act, "", "move.{$menu_info}.".$menu_act);
+
+				if($_POST['menuSetCustomPages'])
+				{
+					$this->menuSetCustomPages($_POST['custompages']);
+				}
+
+				if(isset($_POST['menuUsePreset']) && $_POST['curLayout'])
+				{
+
+					$this->menuSetPreset();
+				}
+
+		}
+
+    // -------------------------------------------------------------------------
+
+    function menuGrabLayout()
+	{
+			global $HEADER,$FOOTER,$CUSTOMHEADER,$CUSTOMFOOTER;
+
+            	if(($this->curLayout == 'legacyCustom' || $this->curLayout=='legacyDefault') && (isset($CUSTOMHEADER) || isset($CUSTOMFOOTER)) )  // 0.6 themes.
+				{
+				 	if($this->curLayout == 'legacyCustom')
+					{
+						$HEADER = ($CUSTOMHEADER) ? $CUSTOMHEADER : $HEADER;
+						$FOOTER = ($CUSTOMFOOTER) ? $CUSTOMFOOTER : $FOOTER;
 					}
 				}
-				$text .= $frm->form_option(MENLAN_20, "", "adv.{$menu_info}");
-				$text .= $frm->form_select_close();
-				$ns->tablerender($caption, $text);
-				echo "<div><br /></div>";
-			}
-			echo $frm->form_close();
-		}
-		if(isset($sc_style['MENU']['post']) && strpos($str, 'ret') !== false) {
-			echo $sc_style['MENU']['post'];
-		}
+				elseif($this->curLayout && $this->curLayout != "legacyCustom" && (isset($CUSTOMHEADER[$this->curLayout]) || isset($CUSTOMHEADER[$this->curLayout]))) // 0.7 themes
+				{
+				 // 	echo " MODE 0.7";
+					$HEADER = ($CUSTOMHEADER[$this->curLayout]) ? $CUSTOMHEADER[$this->curLayout] : $HEADER;
+					$FOOTER = ($CUSTOMFOOTER[$this->curLayout]) ? $CUSTOMFOOTER[$this->curLayout] : $FOOTER;
+				}
+			    elseif($this->curLayout && isset($HEADER[$this->curLayout]) && isset($FOOTER[$this->curLayout])) // 0.8 themes - we use only $HEADER and $FOOTER arrays.
+				{
+				//  echo " MODE 0.8";
+					$HEADER = $HEADER[$this->curLayout];
+					$FOOTER = $FOOTER[$this->curLayout];
+				}
+
+            // Almost the same code as found in templates/header_default.php  ---------
+
 	}
-	else if (strstr($str, "SETSTYLE")) {
-		$tmp = explode("=", $str);
-		$style = preg_replace("/\{SETSTYLE=(.*?)\}/si", "\\1", $str);
-	}
-	else if (strstr($str, "SITEDISCLAIMER")) {
-		echo "[Sitedisclaimer]";
-	}
-}
-//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
-require_once("footer.php");
 
 
 
-   /*
-	if ($CUSTOMPAGES)
-	{
-		if ($menu_act != 'adv')
+	// -----------------------------------------------------------------------------
+
+	    function menuModify()
 		{
-			$text = "<form  method='post' action='".e_SELF."?configure.".$curLayout."'><div style='width: 100%'>
-			<table class='fborder' style='".ADMIN_WIDTH."'>
-			<tr>
-			<td class='forumheader3' style='width: 90%'>
-			".MENLAN_30."
-			</td>
-			<td class='forumheader3' style='width: 10%; text-align: center;'>";
+			global $pref,$sql,$admin_log,$ns;
 
-			$text .= $frm->form_select_open('custom_select', 'onchange="this.form.submit()"');
-
-			if ($curLayout == '' || $curLayout == 'default_layout')
+	        if (isset($_POST['menuAct']))
 			{
-				$text .= $frm->form_option(MENLAN_31, 'selected', 'default_layout');
+				  foreach ($_POST['menuAct'] as $k => $v)
+				  {
+					if (trim($v))
+					{
+					  $this->menuId = $k;
+					  list($menu_act, $location, $position, $this->menuNewLoc) = explode(".", $_POST['menuAct'][$k]);
+					}
+				  }
+			}
+
+			if ($menu_act == 'config')
+			{
+					if($this->menuNewLoc)
+					{
+						$this->menuNewLoc = ".".$this->menuNewLoc;
+					}
+					$newurl = $PLUGINS_DIRECTORY.$location."/{$position}{$this->menuNewLoc}.php";
+					$newurl = SITEURL.str_replace("//", "/", $newurl);
+					echo "<script type='text/javascript'>	top.location.href = '{$newurl}'; </script> ";
+					exit;
+			}
+
+
+
+
+
+			if ($menu_act == "sv")
+			{
+				$this->menuSaveVisibility();
+
+			}
+
+			if ($menu_act == "adv")
+			{
+				$this->menuVisibilityOptions();
+			}
+
+			if ($menu_act == "move")
+			{
+			 	$this->menuMove();
+			}
+
+			if ($menu_act == "deac")
+			{
+			 	$this->menuDeactivate();
+			}
+
+			if ($menu_act == "bot")
+			{
+				$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location='{$location}' AND menu_layout = '".$this->dbLayout."'  ");
+				$sql->db_Update("menus", "menu_order=".($menu_count+1)." WHERE menu_order='{$position}' AND menu_location='{$location}' AND menu_layout = '$this->dbLayout'  ");
+				$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location='{$location}' AND menu_order > {$position} AND menu_layout = '".$this->dbLayout."' ");
+				$admin_log->log_event('MENU_06',$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			}
+
+			if ($menu_act == "top")
+			{
+				$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_location='{$location}' AND menu_order < {$position} AND menu_layout = '".$this->dbLayout."' ",$this->debug);
+				$sql->db_Update("menus", "menu_order=1 WHERE menu_id='{$this->menuId}' ");
+				$admin_log->log_event('MENU_05',$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			}
+
+			if ($menu_act == "dec")
+			{
+				$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_order='".($position+1)."' AND menu_location='{$location}' AND menu_layout = '".$this->dbLayout."' ",$this->debug);
+				$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_id='{$this->menuId}' AND menu_location='{$location}' AND menu_layout = '".$this->dbLayout."' ",TRUE);
+				$admin_log->log_event('MENU_08',$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			}
+
+			if ($menu_act == "inc")
+			{
+				$sql->db_Update("menus", "menu_order=menu_order+1 WHERE menu_order='".($position-1)."' AND menu_location='{$location}' AND menu_layout = '".$this->dbLayout."' ",$this->debug);
+				$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_id='{$this->menuId}' AND menu_location='{$location}' AND menu_layout = '".$this->dbLayout."' ");
+				$admin_log->log_event('MENU_07',$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			}
+
+			if (strpos(e_QUERY, 'configure') === FALSE)
+			{  // Scan plugin directories to see if menus to add
+			    $this->menuScanMenus();
+			}
+		}
+
+
+
+
+
+
+	// ----------------------------------------------------------------------------
+
+	function menuSetPreset()
+	{
+		global $pref,$sql,$location,$admin_log;
+
+	    $menuAreas = $this->getMenuPreset();
+
+	    $sql->db_Update("menus", "menu_location='0' WHERE menu_layout = '".$this->dbLayout."' "); // Clear All existing.
+		foreach($menuAreas as $val)
+		{
+
+			if($sql->db_Select("menus", 'menu_name, menu_path' , "menu_name = '".$val['menu_name']."' LIMIT 1"))
+			{
+				$row=$sql->db_Fetch();
+
+	        	if(!$sql->db_Update('menus', "menu_order='{$val['menu_order']}', menu_location = ".$val['menu_location'].", menu_class= ".$val['menu_class']." WHERE menu_name='".$val['menu_name']."' AND menu_layout = '".$this->dbLayout."' LIMIT 1 "))
+				{
+	 				$qry = "
+					INSERT into #menus
+					(`menu_name`, `menu_location`, `menu_order`, `menu_pages`,`menu_class`, `menu_path`, `menu_layout`)
+					VALUES ('{$val['menu_name']}', {$val['menu_location']}, {$val['menu_order']}, '', '{$val['menu_class']}',  '{$row['menu_path']}', '".$this->dbLayout."')
+					";
+					$sql->db_Select_gen($qry,$this->debug);
+				  	$admin_log->log_event('MENU_01',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$menu_count.'[!br!]'.$row['menu_path'],E_LOG_INFORMATIVE,'');
+
+				}
+	         }
+		}
+
+	}
+
+
+	// ----------------------------------------------------------------------------
+
+	function menuScanMenus()
+	{
+		global $sql, $sql2;
+
+			$efile = new e_file;
+			$efile->dirFilter = array('/', 'CVS', '.svn', 'languages');
+			$fileList = $efile->get_files(e_PLUGIN,"_menu\.php$",'standard',2);
+			foreach($fileList as $file)
+			{
+			  list($parent_dir) = explode('/',str_replace(e_PLUGIN,"",$file['path']));
+			  $file['path'] = str_replace(e_PLUGIN,"",$file['path']);
+			  $file['fname'] = str_replace(".php","",$file['fname']);
+			  $valid_menu = FALSE;
+			  $existing_menu = $sql->db_Count("menus", "(*)", "WHERE menu_name='{$file['fname']}'");
+			  if (file_exists(e_PLUGIN.$parent_dir."/plugin.xml") ||
+				file_exists(e_PLUGIN.$parent_dir."/plugin.php"))
+			  {
+		//		include(e_PLUGIN.$parent_dir."/plugin.php");
+				if (isset($pref['plug_installed'][$parent_dir]))
+		//		if ($sql->db_Select("plugin", "*", "plugin_path='".$eplug_folder."' AND plugin_installflag='1' "))
+				{  // Its a 'new style' plugin with a plugin.php file, or an even newer one with plugin.xml file - only include if plugin installed
+				  $valid_menu = TRUE;		// Whether new or existing, include in list
+				}
+			  }
+			  else
+			  {  // Just add the menu anyway
+				  $valid_menu = TRUE;
+			  }
+			  if ($valid_menu)
+			  {
+			    $menustr .= "&".str_replace(".php", "", $file['fname']);
+				if (!$existing_menu)
+				{  // New menu to add to list
+					  if($sql->db_Insert("menus", " 0, '{$file['fname']}', 0, 0, 0, '' ,'{$file['path']}', ''"))
+					  {
+					  		// Could do admin logging here - but probably not needed
+					  	$message .= "<b>".MENLAN_10." - ".$file['fname']."</b><br />";
+					  }
+				}
+			  }
+			}
+
+			//Reorder all menus into 1...x order
+			if (!is_object($sql2)) $sql2 = new db;		// Shouldn't be needed
+			foreach ($this->menu_areas as $menu_act)
+			{
+				if ($sql->db_Select("menus", "menu_id", "menu_location={$menu_act} ORDER BY menu_order ASC"))
+				{
+					$c = 1;
+					while ($row = $sql->db_Fetch())
+					{
+						$sql2->db_Update("menus", "menu_order={$c} WHERE menu_id=".$row['menu_id']);
+						$c++;
+					}
+				}
+			}
+
+			$sql->db_Select("menus", "*", "menu_path NOT REGEXP('[0-9]+') ");
+			while (list($menu_id, $menu_name, $menu_location, $menu_order) = $sql->db_Fetch(MYSQL_NUM))
+			{
+				if (stristr($menustr, $menu_name) === FALSE)
+				{
+					$sql2->db_Delete("menus", "menu_name='$menu_name'");
+					$message .= "<b>".MENLAN_11." - ".$menu_name."</b><br />";
+				}
+			}
+
+			echo $message;
+	}
+
+	// ---------------------------------------------------------------------------
+
+	function menuVisibilityOptions()
+	{
+		global $sql,$ns;
+		require_once(e_HANDLER."userclass_class.php");
+		$sql->db_Select("menus", "*", "menu_id=".$this->menuId);
+		$row = $sql->db_Fetch();
+		$listtype = substr($row['menu_pages'], 0, 1);
+		$menu_pages = substr($row['menu_pages'], 2);
+		$menu_pages = str_replace("|", "\n", $menu_pages);
+
+		$text = "<div style='text-align:center;'>
+		<form  method='post' action='".e_SELF."?configure.".$this->curLayout."'>
+		<table style='width:40%'>
+		<tr>
+		<td>
+		<input type='hidden' name='menuAct[{$row['menu_id']}]' value='sv.{$row['menu_id']}' />
+		".MENLAN_4." ".
+		r_userclass('menu_class', $row['menu_class'], "off", "public,member,guest,admin,main,classes,nobody")."
+		</td>
+		</tr>
+		<tr><td><br />";
+		$checked = ($listtype == 1) ? " checked='checked' " : "";
+		$text .= "<input type='radio' {$checked} name='listtype' value='1' /> ".MENLAN_26."<br />";
+		$checked = ($listtype == 2) ? " checked='checked' " : "";
+		$text .= "<input type='radio' {$checked} name='listtype' value='2' /> ".MENLAN_27."<br /><br />".MENLAN_28."<br />";
+		$text .= "<textarea name='pagelist' cols='60' rows='10' class='tbox'>$menu_pages</textarea>";
+		$text .= "
+		<tr>
+		<td style='text-align:center'><br />
+		<input class='button' type='submit' name='class_submit' value='".MENLAN_6."' />
+		</td>
+		</tr>
+		</table>
+		</form>
+		</div>";
+		$caption = MENLAN_7." ".$row['menu_name'];
+		$ns->tablerender($caption, $text);
+	}
+
+
+
+	// -----------------------------------------------------------------------------
+
+
+	function menuActivate()    // Activate Multiple Menus.
+	{
+		global $sql, $admin_log, $pref;
+
+		$location = $this->menuActivateLoc;
+
+		$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location=".$location." AND menu_layout = '".$this->dbLayout."' ");
+
+		foreach($this->menuActivateIds as $sel_mens)
+		{
+			//Get info from menu being activated
+			if($sql->db_Select("menus", 'menu_name, menu_path' , "menu_id = ".$sel_mens." "))
+			{
+				$row=$sql->db_Fetch();
+				//If menu is not already activated in that area, add the record.
+
+				$query = "SELECT menu_name,menu_path FROM #menus WHERE menu_name='".$row['menu_name']."' AND menu_layout = '".$this->dbLayout."' AND menu_location = ".$location." LIMIT 1 ";
+
+				if(!$sql->db_Select_gen($query, $this->debug))
+				{
+					$qry = "
+					INSERT into #menus
+					(`menu_name`, `menu_location`, `menu_order`, `menu_pages`, `menu_path`, `menu_layout`)
+					VALUES ('{$row['menu_name']}', {$location}, {$menu_count}, '', '{$row['menu_path']}', '".$this->dbLayout."')
+					";
+					$sql->db_Select_gen($qry,$this->debug);
+					$admin_log->log_event('MENU_01',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$menu_count.'[!br!]'.$row['menu_path'],E_LOG_INFORMATIVE,'');
+					$menu_count++;
+				}
+			}
+		}
+	}
+
+
+
+	// -----------------------------------------------------------------------------
+
+
+	function menuSetCustomPages($array)
+	{
+		global $pref;
+		$key = key($array);
+		$pref['sitetheme_custompages'][$key] = array_filter(explode(" ",$array[$key]));
+		save_prefs();
+	}
+
+
+	// ------------------------------------------------------------------------------
+
+	function getMenuPreset()
+	{
+		global $pref;
+
+		$layout = $this->curLayout;
+	 //	print_a($pref['sitetheme_layouts'][$layout]['menuPresets']);
+	    if(!isset($pref['sitetheme_layouts'][$layout]['menuPresets']))
+		{
+	    	return;
+		}
+
+		$temp = $pref['sitetheme_layouts'][$layout]['menuPresets']['area'];
+
+		foreach($temp as $key=>$val)
+		{
+			$iD = $val['@attributes']['id'];
+			foreach($val['menu'] as $k=>$v)
+			{
+				$uclass = (defined(trim($v['@attributes']['userclass']))) ? constant(trim($v['@attributes']['userclass'])) : 0;
+				$menuArea[] = array(
+					'menu_location' => $iD,
+					'menu_order'	=> $k,
+					'menu_name'		=> $v['@attributes']['name']."_menu",
+					'menu_class'	=> intval($uclass)
+				);
+			}
+		}
+
+	    return $menuArea;
+
+	}
+
+
+	// ------------------------------------------------------------------------------
+
+	function checkMenuPreset($array,$name)
+	{
+		if(!is_array($array))
+		{
+	    	return;
+		}
+		foreach($array as $key=>$val)
+		{
+	        if($val['menu_name']==$name)
+			{
+				return $val['menu_location'];
+			}
+		}
+
+	    return FALSE;
+	}
+
+
+
+	// --------------------------------------------------------------------------
+
+	function menuSaveVisibility()
+	{
+		global $sql, $admin_log;
+		$pagelist = explode("\r\n", $_POST['pagelist']);
+		for ($i = 0 ; $i < count($pagelist) ; $i++)
+		{
+			$pagelist[$i] = trim($pagelist[$i]);
+		}
+		$plist = implode("|", $pagelist);
+		$pageparms = $_POST['listtype'].'-'.$plist;
+		$pageparms = preg_replace("#\|$#", "", $pageparms);
+		$pageparms = (trim($_POST['pagelist']) == '') ? '' : $pageparms;
+
+		if($sql->db_Update("menus", "menu_class='".$_POST['menu_class']."', menu_pages='{$pageparms}' WHERE menu_id=".intval($this->menuId)))
+		{
+			$admin_log->log_event('MENU_02',$_POST['menu_class'].'[!br!]'.$pageparms.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			$message = "<br />".MENLAN_8."<br />";
+		}
+		else
+		{
+	     	$message = "the update failed";
+
+		}
+
+	    echo $message;
+
+	}
+
+
+
+	// -----------------------------------------------------------------------
+
+	function menuDeactivate()
+	{	// Get current menu name
+		global $sql,$admin_log;
+
+		echo "ID = ".$this->menuId;
+		if($sql->db_Select('menus', 'menu_name', 'menu_id='.$this->menuId, 'default'))
+		{
+
+			$row = $sql->db_Fetch();
+			//Check to see if there is already a menu with location = 0 (to maintain BC)
+			if($sql->db_Select('menus', 'menu_id', "menu_name='{$row['menu_name']}' AND menu_location = 0 AND menu_layout ='".$this->dbLayout."' LIMIT 1"))
+			{
+				//menu_location=0 already exists, we can just delete this record
+				$sql->db_Delete('menus', 'menu_id='.$this->menuId);
 			}
 			else
 			{
-				$text .= $frm->form_option(MENLAN_31, FALSE, 'default_layout');
+				//menu_location=0 does NOT exist, let's just convert this to it
+				if(!$sql->db_Update("menus", "menu_location=0, menu_order=0, menu_class=0, menu_pages='' WHERE menu_id=".$this->menuId))
+				{
+	            	$message = "FAILED";
+				}
 			}
+			//Move all other menus up
+			$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location={$location} AND menu_order > {$position} AND menu_layout = '".$this->dbLayout."' ");
+			$admin_log->log_event('MENU_04',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+		}
 
-			if ($NEWSHEADER)
+		echo $message;
+	}
+
+
+	// ----------------------------------------------------------------------
+
+	function menuMove()
+	{// Get current menu name
+
+			global $admin_log,$sql;
+
+			if($sql->db_Select('menus', 'menu_name', 'menu_id='.$this->menuId, 'default'))
 			{
-				if ($curLayout == 'newsheader_layout')
+				$row = $sql->db_Fetch();
+				//Check to see if menu is already active in the new area, if not then move it
+				if(!$sql->db_Select('menus', 'menu_id', "menu_name='{$row['menu_name']}' AND menu_location = ".$this->menuNewLoc." AND menu_layout='".$this->dbLayout ."' LIMIT 1"))
 				{
-					$text .= $frm->form_option(MENLAN_32, 'selected', 'newsheader_layout');
-				}
-				else
-				{
-					$text .= $frm->form_option(MENLAN_32, FALSE, 'newsheader_layout');
+					$menu_count = $sql->db_Count("menus", "(*)", " WHERE menu_location=".$this->menuNewLoc);
+					$sql->db_Update("menus", "menu_location='{$this->menuNewLoc}', menu_order=".($menu_count+1)." WHERE menu_id=".$this->menuId);
+					$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location='{$location}' AND menu_order > {$position} AND menu_layout='".$this->dbLayout ."' ");
 				}
+				$admin_log->log_event('MENU_03',$row['menu_name'].'[!br!]'.$this->menuNewLoc.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
 			}
+	}
 
-			if ($CUSTOMPAGES)
+
+	// =-----------------------------------------------------------------------------
+
+
+	function menuRenderPage()
+	{
+		global $sql, $ns, $HEADER, $FOOTER, $frm, $pref, $tp;
+
+		echo "<div id='portal'>";
+		$this->parseheader($HEADER);  // $layouts_str;
+
+		$layout = ($this->curLayout);
+		$menuPreset = $this->getMenuPreset($layout);
+
+
+		echo "<div style='text-align:center'>";
+		echo $frm->form_open("post", e_SELF."?configure.".$this->curLayout, "menuActivation");
+		$text = "<table style='width:80%;margin-left:auto;margin-right:auto'>";
+
+
+		$text .= "<tr><td style='width:50%;text-align:center;padding-bottom:4px'>".MENLAN_36."...</td><td style='width:50%;padding-bottom:4px;text-align:center'>...".MENLAN_37."</td></tr>";
+		$text .= "<tr><td style='width:50%;vertical-align:top;text-align:center'>";
+
+	 	$sql->db_Select("menus", "menu_name, menu_id, menu_pages", "1 GROUP BY menu_name ORDER BY menu_name ASC");
+
+		if(!$this->dragDrop)
+		{
+			$text .= "<div class='portal-column' id='portal-column-block-list' style='border:1px inset black;height:200px;display:block;overflow:auto;margin-bottom:20px'>";
+			$text .= "<table id='core-menumanager-main' style='width:100%;margin-left:auto;margin-right:auto' cellspacing='0' cellpadding='0'>\n";
+
+		}
+		else
+		{
+        	$text .= "<div class='portal-column' id='portal-column-block-list' style='border:1px solid silver'>\n";
+		}
+
+
+		while ($row = $sql->db_Fetch())
+		{
+			$pdeta = "";
+	        $color = ($color == "white") ? "#DDDDDD" : "white";
+			if($row['menu_pages'] == "dbcustom")
 			{
-				if (is_array($CUSTOMPAGES))
+				$pdeta = MENLAN_42;
+			}
+			else
+			{
+				$row['menu_name'] = preg_replace("#_menu$#i", "", $row['menu_name']);
+	            if($pnum = $this->checkMenuPreset($menuPreset,$row['menu_name']."_menu"))
 				{
-					foreach ($CUSTOMPAGES as $custom_pages_key => $custom_pages_value)
-					{
-						if ($curLayout == $custom_pages_key)
-						{
-							$text .= $frm->form_option($custom_pages_key, 'selected', $custom_pages_key);
-						}
-						else
-						{
-							$text .= $frm->form_option($custom_pages_key, FALSE, $custom_pages_key);
-						}
-					}
-				}
-				else
-				{
-					if ($curLayout == 'custom_layout')
-					{
-						$text .= $frm->form_option(MENLAN_33, 'selected', 'custom_layout');
-					}
-					else
-					{
-						$text .= $frm->form_option(MENLAN_33, FALSE, 'custom_layout');
-					}
+		        	$pdeta = MENLAN_39." {$pnum}";
 				}
 			}
 
-			$text .= $frm->form_select_close();
+	        if(!$this->dragDrop)
+			{
+	    		$text .= "<tr style='background-color:$color;color:black'>
+				<td style='text-align:left; color:black;'><input type='checkbox' name='menuselect[]' value='{$row['menu_id']}' />".$row['menu_name']."</td>
+	            <td style='color:black'> ".$pdeta."&nbsp;</td>
+				</tr>\n";
+	        }
+			else
+			{
+	            $text .= "<div class='block block-archive' id='block-archive-".$row['menu_id']."' style='border:1px outset black;text-align:left;color:black'>
 
-			$text .= "</td>
-			</tr>
-			</table></div>
-			</form>";
+				<div class='block-toggle'><input type='checkbox' name='menuselect[]' value='{$row['menu_id']}' />".$row['menu_name']."  $pdeta</div>
+	            <div class='content'>";
+			 	$text .= $this->menuRenderMenu($row,$menu_count);
+	  			$text .= "</div></div>\n";
+			}
+		}
+		$text .= (!$this->dragDrop) ? "</table>" : "";
+		$text .= "</div>";
 
-			$ns->tablerender(MENLAN_29, $text);
+		$text .= "</td><td style='width:50%;vertical-align:top;text-align:center'><br />";
+		foreach ($this->menu_areas as $menu_act)
+		{
+			$text .= "<input type='submit' class='button' id='menuActivate_".trim($menu_act)."' name='menuActivate[".trim($menu_act)."]' value='".MENLAN_13." ".trim($menu_act)."' /><br /><br />\n";
+		}
+
+
+	    if($layout)
+		{
+			if(isset($pref['sitetheme_layouts'][$layout]['menuPresets']))
+			{
+		    	$text .= "<input type='submit' class='button' name='menuUsePreset' value=\"".MENLAN_40."\" onclick=\"return jsconfirm('".$tp->toJS(MENLAN_41)."')\" /><br /><br />\n";  // Use Menu Presets
+				$text .= "<input type='hidden' name='menuPreset' value='".$layout."' />";
+			}
+			$text .= "<input type='hidden' name='curLayout' value='".$layout."' />";
+	    }
+
+		$text .= "</td>";
+
+		$text .= "</tr></table>";
+		$ns -> tablerender(MENLAN_22, $text);
+        echo $frm->form_close();
+		echo "</div>";
+
+
+
+		$this->parseheader($FOOTER);
+	    	echo "<div id='debug' style='margin-left:0px;border:1px solid silver; overflow:scroll;height:250px'> &nbsp;</div>";
+
+		echo "</div>";
+	}
+
+
+
+
+
+	//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
+	function menuSelectLayout()
+	{
+		global $frm, $pref;
+
+		$text .= "<form  method='post' action='".e_SELF."?configure.".$this->curLayout."'>";
+		$text .= "<div style='color:white;background-color:black;width:98%;display:block;padding:15px;text-align:center'>".MENLAN_30." ";
+	    $text .= "<select style='color:black' name='custom_select' onchange='urljump(this.options[selectedIndex].value)'>\n";
+
+	    $search = array("_","legacyDefault","legacyCustom");
+		$replace = array(" ",MENLAN_31,MENLAN_33);
+
+
+	    foreach($pref['sitetheme_layouts'] as $key=>$val)
+		{
+			$layoutName = str_replace($search,$replace,$key);
+			$layoutName .=($key==$pref['sitetheme_deflayout']) ? " (".MENLAN_31.")" : "";
+			$selected = ($this->curLayout == $key || ($key==$pref['sitetheme_deflayout'] && $this->curLayout=='')) ? "selected='selected'" : FALSE;
+	    	$text .= "<option value='".e_SELF."?configure.".$key."' {$selected}>".$layoutName."</option>";
+		}
+
+	    $text .= "</select>
+		</div></form>";
+		  return $text;
+	}
+
+	//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
+	function parseheader($LAYOUT, $check = FALSE)
+	{
+		//  $tmp = explode("\n", $LAYOUT);
+		// Split up using the same function as the shortcode handler
+		  $tmp = preg_split('#(\{\S[^\x02]*?\S\})#', $LAYOUT, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+		  for ($c = 0; $c < count($tmp); $c++)
+		  {
+			if (preg_match("/[\{|\}]/", $tmp[$c]))
+			{
+			  if ($check)
+			  {
+					if (strstr($tmp[$c], "{MENU="))
+					{
+					  $str[] = preg_replace("/\{MENU=(.*?)(:.*?)?\}/si", "\\1", $tmp[$c]);
+					}
+			  }
+			  else
+			  {
+				$this->checklayout($tmp[$c],$this->curLayout);
+			  }
+			}
+			else
+			{
+			  if (!$check)
+			  {
+				echo $tmp[$c];
+			  }
+			}
+		  }
+		  if ($check)
+		  {
+			return $str;
+		  }
+	}
+
+	function checklayout($str)
+	{	// Displays a basic representation of the theme
+		global $pref, $ns, $PLUGINS_DIRECTORY, $frm, $sc_style, $tp, $menu_order;
+
+	    $menuLayout = ($this->curLayout != $pref['sitetheme_deflayout']) ? $this->curLayout : "";
+
+		if (strstr($str, "LOGO"))
+		{
+		  echo $tp -> parseTemplate("{LOGO}");
+		}
+		else if(strstr($str, "SITENAME"))
+		{
+		  echo "<div style='padding: 2px'>[SiteName]</div>";
+		}
+		else if (strstr($str, "SITETAG"))
+		{
+		  echo "<div style='padding: 2px'>[SiteTag]</div>";
+		}
+		else if (strstr($str, "SITELINKS"))
+		{
+		  echo "<div style='padding: 2px; text-align: center'>[SiteLinks]</div>";
+		}
+		else if (strstr($str, "LANGUAGELINKS"))
+		{
+		  echo "<div class=text style='padding: 2px; text-align: center'>[Language]</div>";
+		}
+		else if (strstr($str, "CUSTOM"))
+		{
+		  $cust = preg_replace("/\W*\{CUSTOM=(.*?)(\+.*)?\}\W*/si", "\\1", $str);
+		  echo "<div style='padding: 2px'>[".$cust."]</div>";
+		}
+		// Display embedded Plugin information.
+		else if (strstr($str, "PLUGIN"))
+		{
+			$plug = preg_replace("/\{PLUGIN=(.*?)\}/si", "\\1", $str);
+			$plug = trim($plug);
+			if (file_exists((e_PLUGIN."{$plug}/{$plug}_config.php")))
+			{
+			  $link = e_PLUGIN."{$plug}/{$plug}_config.php";
+			}
+
+			if(file_exists((e_PLUGIN.$plug."/config.php")))
+			{
+			  $link = e_PLUGIN.$plug."/config.php";
+			}
+
+			$plugtext = ($link) ? "(".MENLAN_34.":<a href='$link' title='".MENLAN_16."'>".MENLAN_16."</a>)" : "(".MENLAN_34.")" ;
+			echo "<br />";
+			$ns -> tablerender($plug, $plugtext);
+		}
+		else if (strstr($str, "MENU"))
+		{
+		  //	$ns = new e107table;
+			$menu = preg_replace("/\{MENU=(.*?)(:.*?)?\}/si", "\\1", $str);
+			if (isset($sc_style['MENU']['pre']) && strpos($str, 'ret') !== false)
+			{
+			  echo $sc_style['MENU']['pre'];
+			}
+			echo "
+	        <div class='portal-column' id='portal-column-".$menu."'>
+
+			<div style='text-align:center; font-size:14px' class='fborder'>
+
+			<div class='forumheader'><b>".MENLAN_14."  ".$menu."</b></div></div><br />";
+			$text = "&nbsp;";
+			$sql9 = new db;
+			if ($sql9->db_Count("menus", "(*)", " WHERE menu_location='$menu' AND menu_layout = '".$this->dbLayout."' "))
+			{
+				unset($text);
+				echo $frm->form_open("post", e_SELF."?configure.".$this->curLayout, "frm_menu_".intval($menu));
+
+	            $MODE = 1;
+
+				$sql9->db_Select("menus", "*", "menu_location='$menu' AND menu_layout='".$this->dbLayout."' ORDER BY menu_order");
+				$menu_count = $sql9->db_Rows();
+				while ($row = $sql9->db_Fetch(MYSQL_ASSOC))
+				{
+	                    	echo "\n\n\n <!-- Menu Start -->\n\n
+					<div class='block' id='block-".$row['menu_id']."'>
+
+					<div class='content'>";
+
+						 echo $this->menuRenderMenu($row,$menu_count);
+
+	                echo "\n</div></div>";
+					echo "\n\n\n<!-- Menu end -->\n\n\n";
+					echo "<div><br /></div>";
+
+
+				}
+
+				echo $frm->form_close();
+			}
+			echo "</div>";
+			if(isset($sc_style['MENU']['post']) && strpos($str, 'ret') !== false) {
+				echo $sc_style['MENU']['post'];
+			}
+		}
+		else if (strstr($str, "SETSTYLE")) {
+			$tmp = explode("=", $str);
+			$style = preg_replace("/\{SETSTYLE=(.*?)\}/si", "\\1", $str);
+		}
+		else if (strstr($str, "SITEDISCLAIMER")) {
+			echo "[Sitedisclaimer]";
 		}
 	}
+	//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
+
+	function menuRenderMenu($row,$menu_count )
+	{
+		global $ns,$frm,$menu,$menu_info,$menu_act;
+	                              //      $menu_count is empty in here
+		extract($row);
+		if(!$menu_id){ return; }
+
+					$menu_name = preg_replace("#_menu#i", "", $menu_name);
+					$vis = ($menu_class || strlen($menu_pages) > 1) ? " <span style='color:red'>*</span> " : "";
+					$caption = "<div style='text-align:center'>{$menu_name}{$vis}</div>";
+					$menu_info = "{$menu_location}.{$menu_order}";
+
+					$text = "";
+					$conf = '';
+					if (file_exists(e_PLUGIN."{$menu_path}/{$menu_name}_menu_config.php"))
+					{
+					  $conf = "config.{$menu_path}.{$menu_name}_menu_config";
+					}
+
+					if($conf == '' && file_exists(e_PLUGIN."{$menu_path}/config.php"))
+					{
+					  $conf = "config.{$menu_path}.config";
+					}
+
+					$text .= "<select id='menuAct_".$menu_id."' name='menuAct[$menu_id]' class='tbox' onchange='this.form.submit()' >";
+					$text .= $frm->form_option(MENLAN_25, TRUE, " ");
+					$text .= $frm->form_option(MENLAN_15, "", "deac.{$menu_info}");
+
+					if ($conf) {
+						$text .= $frm->form_option(MENLAN_16, "", $conf);
+					}
+
+					if ($menu_order != 1) {
+						$text .= $frm->form_option(MENLAN_17, "", "inc.{$menu_info}");
+						$text .= $frm->form_option(MENLAN_24, "", "top.{$menu_info}");
+					}
+					if ($menu_count != $menu_order) {
+						$text .= $frm->form_option(MENLAN_18, "", "dec.{$menu_info}");
+						$text .= $frm->form_option(MENLAN_23, "", "bot.{$menu_info}");
+					}
+					foreach ($this->menu_areas as $menu_act) {
+						if ($menu != $menu_act) {
+							$text .= $frm->form_option(MENLAN_19." ".$menu_act, "", "move.{$menu_info}.".$menu_act);
+						}
+					}
+
+					$text .= $frm->form_option(MENLAN_20, "", "adv.{$menu_info}");
+					$text .= $frm->form_select_close();
+
+					if($this->dragDrop)
+					{
+
+				 		$text .= "<div class=\"block-controls\">";
+	               		$text .= "<a class=\"block-remove\"><span>x</span></a> <a class=\"block-config\"><span>e</span></a></div>";
+	                    $text .= "	<div class=\"config\" style=\"display: none; width: 200px;\">
+							<div>config-params</div>
+							<div style='float:right'>
+								<a href=\"#\" class=\"cancel-button\">cancel</a>
+								<a href=\"#\" class=\"save-button\">save</a>
+							</div>
+						</div>";
+	                }
+
+					ob_start();
+
+					$ns->tablerender($caption, $text);
+					$THEX = ob_get_contents();
+
+					ob_end_clean();
+					return $THEX;
+
+	}
+
+	function menuSaveAjax()
+	{
+        if(!$this->dragDrop){ return; }
+
+	    global $sql;
+	    $query = explode(':', $_POST['value']);
+		$loc = intval(str_replace('portal-column-','',$query[0]));
+
+		$srch = array('block-archive-','block-');
+		$repl = array('','');
+		$blocks = str_replace($srch,$repl,$query[1]);
+
+	    $tmp = explode(',',$blocks);
+
+		$this->menuActivateLoc = $loc;  // location
+		$this->menuActivateIds = $tmp;  // array of ids, in order.
+		$this->menuActivate();
+
+		echo "<hr />";
+
+
+	}
+}  // end of Class.
+
+require_once("footer.php");
+
+ // -----------------------------------------------------------------------
+
+function headerjs()
+{
+	global $sql,$pref,$men;
+
+    if(!$men->dragDrop)
+	{
+    	return;
+	}
+
+
+    $tmp = explode('.', e_QUERY);
+	$curLayout = ($tmp[1]) ? $tmp[1] : $pref['sitetheme_deflayout'];
+	$dbLayout = ($curLayout !=$pref['sitetheme_deflayout']) ? $curLayout : "";
+
+
+
+    if(strpos(e_QUERY, 'configure') !== FALSE )
+	{
+
+   		$ret = "
+
+		<!-- load prototype and scriptaculous -->
+		<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>
+		<script type=\"text/javascript\">
+  			google.load(\"prototype\", \"1.6.0.3\");
+  			google.load(\"scriptaculous\", \"1.8.2\");
+		</script>
+
+		<!-- load the portal script -->
+		<script type=\"text/javascript\" src=\"".e_FILE_ABS."jslib/portal/portal.js\"></script>
+	  	<link href=\"".e_FILE_ABS."jslib/portal/portal.css\" rel=\"stylesheet\" type=\"text/css\" media=\"all\" />
+
+		<!-- initiate the portal -->
+		<script type=\"text/javascript\">
+			var settings = {
+
+            ";
+
+
+                     //   ," menu_location !=0 AND menu_layout = '{$curLayout}' ORDER BY menu_location,menu_order"
+            $sql -> db_Select("menus", "*"," menu_location !=0 AND menu_layout = '".$dbLayout."' ORDER BY menu_location,menu_order");
+            while($row = $sql-> db_Fetch())
+            {
+
+				$portal[$row['menu_location']][] = "'block-".$row['menu_id']."'";
+        	}
+
+			 foreach($portal as $col=>$val)
+			 {
+             	$ret .= "\t\n'portal-column-".$col."':[".implode(",",$val)."],";
+			 }
+
+      	$ret .= "
+			 };
+			var options = {
+			 editorEnabled : true,
+			  'saveurl' : '".e_SELF."?ajax=',
+			  hoverclass: 'block-hover'
+			 };
+
+			var data = {  };
+
+			var portal;
+
+			Event.observe(window, 'load', function() {
+				portal = new Portal(settings, options, data);
+			}, false);
+
+		</script>";
+	}
+
+
+  /*  	this.options = {
+			editorEnabled 	: false,
+			portal			: 'portal',
+			column			: 'portal-column',
+			block			: 'block',
+			content			: 'content',
+			configElement	: 'config',
+			configSave		: 'save-button',
+			configCancel	: 'cancel-button',
+			handle			: 'handle',
+			hoverclass		: false,
+			remove			: 'block-remove',
+			config			: 'block-config',
+			blocklist		: 'portal-column-block-list',
+			blocklistlink	: 'portal-block-list-link',
+			blocklisthandle : 'block-list-handle',
+			saveurl			: false
+		}
 */
+
+	return $ret;
+
+}
 ?>
\ No newline at end of file
diff --git a/e107_files/jslib/portal/portal.css b/e107_files/jslib/portal/portal.css
new file mode 100644
index 000000000..97a184037
--- /dev/null
+++ b/e107_files/jslib/portal/portal.css
@@ -0,0 +1,130 @@
+#content{
+	margin: 0 auto 0 auto;
+	width: 700px;
+	border: 1px solid red;
+	padding: 15px;
+}
+
+.block{
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+
+#portal .block h3{
+	margin:0;
+	background:transparent none repeat scroll 0 0;
+	border-bottom:1px solid #CCCCCC;
+	color:#4D3870;
+	font-size:18px;
+	height:36px;
+	padding:0px;
+	padding-left:10px;
+	line-height: 35px;
+	width: 100%;
+}
+
+.block {
+  cursor: move;
+}
+
+
+
+
+#portal .block .content{
+	width: 100%;
+}
+
+#portal .block .config{
+	padding: 5px;
+	border-bottom:1px solid #CCCCCC;
+}
+
+#portal .block .config .cancel-button{
+	border: 1px solid #c1c1c1;
+3
+	color: #333333;
+	padding: 3px;
+}
+
+#portal .block .config .save-button{
+	border: 1px solid #c1c1c1;
+	color: #000000;
+	padding: 3px;
+}
+
+#portal .block .block-config, #portal .block .block-remove{
+	padding-right: 10px;
+}
+
+#portal .block-list-handle, #portal .handle {
+	cursor: default;
+	float: left;
+}
+
+.block-controls{
+	float: right;
+	z-index: 101;
+}
+
+#portal .block-controls a{
+	color: #999;
+	font-size: 11px;
+}
+#portal .block-controls a:hover{
+	text-decoration: none;
+}
+
+#portal .handle a {
+	color: #999;
+	font-size: 11px;
+	padding-right: 10px;
+}
+
+#portal .block-controls .block-remove span, #portal .block-controls .block-config span, #portal .handle span{
+	border: 1px solid #EFF0F1;
+	padding: 3px;
+}
+
+#portal .block-controls .block-remove span:hover, #portal .block-controls .block-config span:hover, #portal .handle span:hover{
+	border: 1px solid #ccc;
+	padding: 3px;
+}
+
+#portal .dropHelper{
+   border: 1px solid blue;
+}
+
+#portal .dropHelper div{
+	width: 100%;
+	height: 100%;
+
+	border: 1px dashed blue;
+}
+
+#portal .block-horizontal ul {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type: none;
+}
+
+#portal .block-horizontal ul li {
+	display: inline;
+	padding-right: 10px;
+}
+#portal .block .block-toggle{
+   display: none;
+}
+#portal #portal-column-block-list .block-archive .block-toggle{
+  display: block;
+}
+
+#portal #portal-column-block-list .block .content {
+  display: none;
+}
+#portal .block-hover {
+  border: 1px dashed #f00;
+  padding-bottom: 20px;
+}
+
+
+
diff --git a/e107_files/jslib/portal/portal.js b/e107_files/jslib/portal/portal.js
new file mode 100644
index 000000000..4a57c194a
--- /dev/null
+++ b/e107_files/jslib/portal/portal.js
@@ -0,0 +1,253 @@
+/**
+	iGoogle-style Drag&Drop Portal v1
+
+	Author: M.D.A. (Michel) Hiemstra
+			mhiemstra@php.net
+			www.michelhiemstra.nl
+
+	Inspired by 'Drag/Drop Portal Interface with Drupal'
+
+	Required: Prototype (1.6 and higher)
+			  Script.aculo.us (with Effects and DragDrop) v1.8.2
+
+	Recoded and optimized for Prototype 1.6.0.3
+
+	Licenced CC BY-SA - http://creativecommons.org/licenses/by-sa/3.0/
+
+	Usage:
+
+		<script type="text/javascript">
+			var settings = { 'portal-column-1':['block-test'] };
+			var options = { editorEnabled : true, 'saveurl' : '/path/to/script' };
+			var data = { };
+
+			var portal;
+
+			Event.observe(window, 'load', function() {
+				portal = new Portal(settings, options, data);
+			}, false);
+
+		</script>
+
+		<div id="content">
+			<!-- These are destinations of 'blocks' -->
+			<div id="portal">
+				<div class="portal-column dir-horizontal" id="portal-column-0"></div>
+				<div class="portal-column dir-vertical" id="portal-column-1"></div>
+			</div>
+
+			<!-- These are the blocks you can choose from -->
+			<div class="portal-column" id="portal-column-block-list">
+				<h2 class="block-list-handle">Block List</h2>
+
+				<!-- Block: testblock -->
+				<div class="block block-test" id="block-test">
+					<h3 class="handle"><div class="block-controls" style="display: none;"><a class="block-remove"><span>x</span></a> <a class="block-config"><span>e</span></a></div>Testblock</h3>
+
+					<div class="config" style="display: none;">
+						<div>config-params</div>
+						<div align="right">
+							<a href="#" class="cancel-button">cancel</a>
+							<a href="#" class="save-button">cancel</a>
+						</div>
+					</div>
+
+					<div class="content">
+						<div id="block-test-content">
+							test
+						</div>
+					</div>
+				</div>
+				<!-- End: testblock -->
+
+			</div>
+		</div>
+**/
+
+
+
+var Portal = Class.create();
+
+Portal.prototype = {
+
+	initialize : function (settings, options, data) {
+		// set options
+		this.setOptions(options);
+
+		// set blocks to their positions
+		this.applySettings(settings);
+
+		// load data to blocks
+		this.loadData(data);
+
+		// set styles of blocks
+		this.set_styles();
+
+		// if editor is enabled we proceed
+		if (!this.options.editorEnabled) return;
+
+		// get all available columns
+		var columns = $(this.options.portal).getElementsByClassName(this.options.column);
+
+		// loop trough columns array
+		$A(columns).each(function(column) {
+
+			// create sortable
+			Sortable.create(column, {
+				containment : $A(columns),
+				constraint  : false,
+				ghosting	: true,
+				tag 		: 'div',
+				only 		: this.options.block,
+				dropOnEmpty : true,
+				handle 		: this.options.handle,
+				hoverclass 	: this.options.hoverclass,
+
+				onUpdate 	: function (container) {
+
+					// if we dont have a save url we dont update
+					if (!this.options.saveurl) return;
+
+					// if we are in the same container we do nothing
+					if (container.id == this.options.blocklist) return;
+
+					// get blocks in this container
+					var blocks = container.getElementsByClassName(this.options.block);
+
+					// serialize all blocks in this container
+					var postBody = container.id + ':';
+					postBody += $A(blocks).pluck('id').join(',');
+					postBody = 'value=' + escape(postBody);
+
+					// save it to the database
+					//new Ajax.Request(this.options.saveurl, { method: 'post', postBody: postBody });
+
+					/* DEMO ONLY, REMOVE THIS */
+					new Ajax.Updater('debug', this.options.saveurl, {
+						method: 'post', postBody: postBody,
+						insertion: Insertion.Top
+					});
+
+
+					// reset styles
+					this.set_styles();
+
+				}.bind(this)
+			});
+
+		}.bind(this));
+
+
+		//-----------//
+
+		// get all blocks
+		var blocks = $(this.options.portal).getElementsByClassName(this.options.block);
+
+		// loop trough blocks
+		$A(blocks).each(function(block) {
+
+			// enable controls if available
+			if (typeof(block.getElementsByClassName('block-controls').item(0)) == 'object') {
+				block.getElementsByClassName('block-controls').item(0).setStyle({'display' : 'block'});
+			}
+
+			// detail, set cursor style to move when in admin modus
+			if (typeof(block.getElementsByClassName('handle').item(0)) == 'object') {
+			  //	block.getElementsByClassName('handle').item(0).setStyle({'cursor' : 'move'});
+			}
+
+			// toggle configuration element
+			if (typeof(block.getElementsByClassName(this.options.config).item(0)) == 'object') {
+				Event.observe(block.getElementsByClassName(this.options.config).item(0), 'click', function () {
+					block.getElementsByClassName(this.options.configElement).item(0).toggle();
+				}.bind(this));
+			}
+
+			// observe save button
+			if (typeof(block.getElementsByClassName(this.options.configSave).item(0)) == 'object') {
+				Event.observe(block.getElementsByClassName(this.options.configSave).item(0), 'click', function (e) {
+					alert('save');
+				}.bind(this));
+			}
+
+			// observe cancel button
+			if (typeof(block.getElementsByClassName(this.options.configCancel).item(0)) == 'object') {
+				Event.observe(block.getElementsByClassName(this.options.configCancel).item(0), 'click', function (e) {
+					block.getElementsByClassName(this.options.configElement).item(0).toggle();
+				}.bind(this));
+			}
+
+			// observe delete block button
+			if (typeof(block.getElementsByClassName(this.options.remove).item(0)) == 'object') {
+				Event.observe(block.getElementsByClassName(this.options.remove).item(0), 'click', function (e) {
+					if (confirm('Are you sure you wish to delete this block?')) {
+					  //	alert(this.options.saveurl + '?delete')
+						new Ajax.Request(this.options.saveurl + 'delete', { method: 'post', postBody: 'block='+block.id }); $(block.id).hide();
+					}
+				}.bind(this));
+			}
+
+		}.bind(this));
+
+	},
+
+	set_styles : function () {
+
+		// get all blocks
+		var blocks = $(this.options.portal).getElementsByClassName(this.options.block);
+
+		// loop trough blocks
+		$A(blocks).each(function(block) {
+			if (block.up().hasClassName('dir-vertical')) {
+
+				block.removeClassName('block-horizontal').addClassName('block-vertical');
+			} else {
+				block.removeClassName('block-vertical').addClassName('block-horizontal');
+			}
+		}.bind(this));
+
+	},
+
+	applySettings : function (settings) {
+		// apply settings to the array
+		for (var container in settings) {
+			settings[container].each(function (block) { $(container).appendChild($(block)); });
+		}
+	},
+
+	setOptions : function (options) {
+		// set options
+		this.options = {
+			editorEnabled 	: false,
+			portal			: 'portal',
+			column			: 'portal-column',
+			block			: 'block',
+			content			: 'content',
+			configElement	: 'config',
+			configSave		: 'save-button',
+			configCancel	: 'cancel-button',
+			handle			: 'handle',
+			hoverclass		: false,
+			remove			: 'block-remove',
+			config			: 'block-config',
+			blocklist		: 'portal-column-block-list',
+			blocklistlink	: 'portal-block-list-link',
+			blocklisthandle : 'block-list-handle',
+			saveurl			: false
+		}
+
+		Object.extend(this.options, options || {});
+	},
+
+	loadData : function (data) {
+		// load data for each block
+		for (var type in data) {
+			data[type].each(function(block) {
+				for (var blockname in block) {
+					// your code to load data here
+					new Ajax.Updater(blockname + '-content', '/url?'+type+'?data='+block[blockname]);
+				}
+			});
+		}
+	}
+};
\ No newline at end of file
diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php
index 7161490d4..e6c6d71f2 100644
--- a/e107_plugins/tinymce/e_meta.php
+++ b/e107_plugins/tinymce/e_meta.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/e_meta.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-01 02:52:08 $
+|     $Revision: 1.4 $
+|     $Date: 2009-07-10 14:27:31 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -24,6 +24,6 @@ if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php"))
   	require_once(e_PLUGIN."tinymce/wysiwyg.php");
   	echo wysiwyg($e_wysiwyg);
 }
-
+  
 
 ?>
\ No newline at end of file