Merge pull request #290 from BillyBoy0823/master

Closes #251 and Closes #141 - Clean up of menus install

e107_admin/menus.php

@@ -1133,7 +1133,7 @@ if($_POST)
 		//BC - configure and dot delimiter deprecated
 		if (!isset($_GET['configure']))
 		{
-			$men->menuScanMenus();
+//			$men->menuScanMenus();   // - Runs 2x - Is already called by menuModify() in menumanager_class.php
             $text = $men->menuRenderMessage();
             $text .= $men->menuSelectLayout();
 			$text .= $men->menuVisibilityOptions();

e107_core/xml/default_install.xml

@@ -872,8 +872,8 @@ City, State, Country
 			<item>
 				<field name="menu_id">14</field>
 				<field name="menu_name">news_months_menu</field>
-				<field name="menu_location">0</field>
+				<field name="menu_location">1</field>
-				<field name="menu_order">0</field>
+				<field name="menu_order">2</field>
 				<field name="menu_class">0</field>
 				<field name="menu_pages"></field>
 				<field name="menu_path">news/</field>
@@ -946,17 +946,6 @@ City, State, Country
 				<field name="menu_layout"></field>
 				<field name="menu_parms"></field>
 			</item>
-			<item>
-				<field name="menu_id">21</field>
-				<field name="menu_name">news_months_menu</field>
-				<field name="menu_location">1</field>
-				<field name="menu_order">1</field>
-				<field name="menu_class">0</field>
-				<field name="menu_pages"></field>
-				<field name="menu_path">news/</field>
-				<field name="menu_layout"></field>
-				<field name="menu_parms"></field>
-			</item>
 		</dbTable>
 		<dbTable name="news">
 		<item>

e107_handlers/menumanager_class.php

@@ -406,9 +406,12 @@ class e_menuManager {
 
 			//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 (!is_object($sql3)) $sql3 = new db;
+
+			$location_count = $sql3->select("menus", "menu_location", "menu_location>0 GROUP BY menu_location");
+			while ($location_count)
 			{
-				if ($sql->select("menus", "menu_id", "menu_location={$menu_act} ORDER BY menu_order ASC"))
+				if ($sql->select("menus", "menu_id", "menu_location={$location_count} ORDER BY menu_order ASC"))
 				{
 					$c = 1;
 					while ($row = $sql->fetch())
@@ -417,8 +420,8 @@ class e_menuManager {
 						$c++;
 					}
 				}
+				$location_count--;
 			}
-
 			$sql->select("menus", "*", "menu_path NOT REGEXP('[0-9]+') ");
 			while (list($menu_id, $menu_name, $menu_location, $menu_order) = $sql->fetch(MYSQL_NUM))
 			{
@@ -598,6 +601,7 @@ class e_menuManager {
 		$location = $this->menuActivateLoc;
 
 		$menu_count = $sql->count("menus", "(*)", " WHERE menu_location=".$location." AND menu_layout = '".$this->dbLayout."' ");
+		$menu_count++; // Need to add 1 to create NEW order number.
 		
 		foreach($this->menuActivateIds as $sel_mens)
 		{
@@ -784,19 +788,20 @@ class e_menuManager {
 	{	// Get current menu name
 		global $admin_log;
 		$sql = e107::getDb();
+		$sql2 = e107::getDb();
 		
 		//echo "FOUND= ".$this->menuId;
 		$error = false;
 
-		if($sql->gen('SELECT menu_name FROM #menus WHERE menu_id = '.$this->menuId.' LIMIT 1'))
+		if($sql->gen('SELECT menu_name, menu_location, menu_order FROM #menus WHERE menu_id = '.$this->menuId.' LIMIT 1'))
 		{
-			
 			$row = $sql->fetch();
+
 			//Check to see if there is already a menu with location = 0 (to maintain BC)
-			if($sql->select('menus', 'menu_id', "menu_name='{$row['menu_name']}' AND menu_location = 0 AND menu_layout ='".$this->dbLayout."' LIMIT 1"))
+			if($sql2->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
-				if(!$sql->db_Delete('menus', 'menu_id='.$this->menuId))
+				if(!$sql2->db_Delete('menus', 'menu_id='.$this->menuId))
 				{
 					$message = "Deletion Failed";
 					$error = true;
@@ -805,15 +810,15 @@ class e_menuManager {
 			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=".$this->menuId))
+				if(!$sql2->db_Update("menus", "menu_location=0, menu_order=0, menu_class=0, menu_pages='' WHERE menu_id=".$this->menuId))
 				{
 	            	$message = "FAILED";
 					$error = true;
 				}
 			}
-			//Move all other menus up
+			//Move all menus up (reduces order number) that have a higher menu order number than one deactivated, in the selected location. 
-			$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location={$location} AND menu_order > {$position} AND menu_layout = '".$this->dbLayout."' ");
+			$sql->db_Update("menus", "menu_order=menu_order-1 WHERE menu_location={$row['menu_location']} AND menu_order > {$row['menu_order']} AND menu_layout = '".$this->dbLayout."' ");
-			$admin_log->log_event('MENU_04',$row['menu_name'].'[!br!]'.$location.'[!br!]'.$position.'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
+			$admin_log->log_event('MENU_04',$row['menu_name'].'[!br!]'.$row['menu_location'].'[!br!]'.$row['menu_order'].'[!br!]'.$this->menuId,E_LOG_INFORMATIVE,'');
 		}
 		else
 		{