From 9f5356bca1d41e1455ec0eb18bae071f2ec229ba Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Fri, 9 Nov 2012 09:38:34 +0000
Subject: [PATCH] issue 2668 sitemap sort change

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12157 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/menu.admin.model.php | 23 ++++++++++++++++++-----
 modules/menu/queries/getMenus.xml |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 7464f1465..de6f8d59c 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -8,6 +8,8 @@
 	 * @version 0.1
 	 */
     class menuAdminModel extends menu {
+		private $menuSrlWithinHome = 0;
+
 		/**
 		 * Initialization
 		 * @return void
@@ -374,7 +376,7 @@
 				{
 					foreach($menu->list AS $key=>$value)
 					{
-						$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed);
+						$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl);
 					}
 				}
 
@@ -414,7 +416,7 @@
 							{
 								foreach($menu->list AS $key2=>$value2)
 								{
-									$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed);
+									$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl);
 								}
 							}
 
@@ -427,11 +429,21 @@
 							$menuItems->menuSrl = $value->menu_srl;
 							$menuItems->title = $value->title;
 							$menuItems->menuItems = $menu;
-							array_push($menuList, $menuItems);
+
+							if($value->menu_srl == $this->menuSrlWithinHome)
+							{
+								$menuList[-1] = $menuItems;
+							}
+							else
+							{
+								array_push($menuList, $menuItems);
+							}
 						}
 					}
 				}
 			}
+			ksort($menuList);
+
 			$this->add('menuList', $menuList);
 		}
 
@@ -473,7 +485,7 @@
 		 * @param array $menu
 		 * @return void
 		 */
-		private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed)
+		private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl)
 		{
 			$oModuleModel = &getModel('module');
 			// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
@@ -515,6 +527,7 @@
 				if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
 				{
 					$menu['is_start_module'] = true;
+					$this->menuSrlWithinHome = $menuSrl;
 				}
 				// setting layout srl for layout management
 				$menu['layout_srl'] = $midInfo->layout_srl;
@@ -523,7 +536,7 @@
 			{
 				foreach($menu['list'] AS $key=>$value)
 				{
-					$this->_menuInfoSetting($menu['list'][$key], &$start_module, $isMenuFixed);
+					$this->_menuInfoSetting($menu['list'][$key], &$start_module, $isMenuFixed, $menuSrl);
 				}
 			}
 		}
diff --git a/modules/menu/queries/getMenus.xml b/modules/menu/queries/getMenus.xml
index 1c7600f6d..683bff11a 100644
--- a/modules/menu/queries/getMenus.xml
+++ b/modules/menu/queries/getMenus.xml
@@ -10,6 +10,6 @@
         <condition operation="notequal" column="title" default="__ADMINMENU_V17__" pipe="and" />
     </conditions>
     <navigation>
-        <index var="sort_index" default="listorder" order="asc" />
+        <index var="sort_index" default="listorder" order="desc" />
     </navigation>
 </query>