merge 1.4.5.10

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/menu/menu.admin.model.php

@@ -208,10 +208,16 @@
                 }
             }
             Context::set('item_info', $item_info);
-            // Compile the template file into tpl variable and then return it
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
+			//Security
+			$security = new Security();						
+			$security->encodeHTML('group_list..title');
+			$security->encodeHTML('item_info.url');
+			$security->encodeHTML('item_info.name');			
 
+			// Compile the template file into tpl variable and then return it
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');			
+			
             $this->add('tpl', str_replace("\n"," ",$tpl));
         }
 
@@ -253,4 +259,4 @@
             return $moduleInfoList;
 		}
     }
-?>
+?>

modules/menu/menu.admin.view.php

@@ -30,10 +30,14 @@
 
             Context::set('total_count', $output->total_count);
             Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
+            Context::set('page', $output->page);			
             Context::set('menu_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
+			Context::set('page_navigation', $output->page_navigation);
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('menu_list..title');	
+			
             $this->setTemplateFile('index');
         }
  
@@ -68,7 +72,12 @@
             if($menu_info->menu_srl != $menu_srl) return $this->dispMenuAdminContent();
 
             Context::set('menu_info', $menu_info);
-            // Set the layout to be pop-up
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('menu_info..title');			
+
+			// Set the layout to be pop-up
             $this->setTemplateFile('menu_management');
         }
 
@@ -93,7 +102,14 @@
             Context::set('mid_list', $mid_list);
             // Set the menu as a pop-up
             $this->setLayoutFile('popup_layout');
-            // Set a template file
+			//Security
+			$security = new Security();
+			$security->encodeHTML('module_category..title');
+			$security->encodeHTML('module_list..module');
+			$security->encodeHTML('mid_list..module');
+			$security->encodeHTML('mid_list..browser_title');			
+
+			// Set a template file
             $this->setTemplateFile('mid_list');
         }
 

modules/menu/tpl/index.html

@@ -1,3 +1,4 @@
+<<<<<<< .working
 <!--%import("filter/delete_menu.xml")-->
 <!--%import("js/menu_admin.js")-->
 
@@ -49,3 +50,56 @@
     <!--@end-->
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
+=======
+<!--%import("filter/delete_menu.xml")-->
+<!--%import("js/menu_admin.js")-->
+
+<!--#include("header.html")-->
+
+<!-- 삭제를 위한 임시 form -->
+<form id="fo_menu" action="./" method="get">
+    <input type="hidden" name="menu_srl" value="" />
+</form>
+
+<!-- 목록 -->
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+<thead>
+    <tr>
+        <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col" class="wide"><div>{$lang->title}</div></th>
+        <th scope="col"><div>{$lang->regdate}</div></th>
+        <th scope="col" colspan="2"><div>&nbsp;</div></th>
+    </tr>
+</thead>
+<tbody>
+    <!--@foreach($menu_list as $no => $val)-->
+    <tr class="row{$cycle_idx}">
+        <td class="number center">{$no}</td>
+        <td class="wide">{$val->title}</td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispMenuAdminManagement','menu_srl',$val->menu_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="#" onclick="doDeleteMenu('{$val->menu_srl}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th colspan="5" class="button">
+            <a href="{getUrl('act','dispMenuAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </th>
+    </tr>
+</tbody>
+</table>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+</div>
+>>>>>>> .merge-right.r9269

modules/menu/tpl/menu_item_info.html

@@ -22,14 +22,14 @@
         <tr>
             <th scope="row"><div>{$lang->menu_name}</div></th>
             <td>
-                <input type="text" name="menu_name" id="menu_name" value="{htmlspecialchars($item_info->name)}" class="inputTypeText w300"/>
+                <input type="text" name="menu_name" id="menu_name" value="{$item_info->name}" class="inputTypeText w300"/>
                 <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','menu_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             </td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->menu_url}</div></th>
             <td>
-                <input type="text" name="menu_url" value="{htmlspecialchars($item_info->url)}" class="inputTypeText" />
+                <input type="text" name="menu_url" value="{$item_info->url}" class="inputTypeText" />
                 <a href="{getUrl('module','menu','act','dispMenuAdminMidList')}" onclick="popopen(this.href);return false;" class="button black"><span>{$lang->cmd_search_mid}</span> </a>
                 <p class="clear">{$lang->about_menu_url}</p>
             </td>

modules/menu/tpl/menu_management.html

@@ -27,7 +27,7 @@
                 <th scope="col"><div>{$lang->title}</div></th>
                 <td>
                     <div class="fl">
-                        <input type="text" name="title" value="{htmlspecialchars($menu_info->title)}" class="inputTypeText" />
+                        <input type="text" name="title" value="{$menu_info->title}" class="inputTypeText" />
                     </div>
                     <div class="fr">
                         <span class="button"><input type="submit" value="{$lang->cmd_modify}" /></span>

modules/menu/tpl/mid_list.html

@@ -33,6 +33,7 @@
       </tr>
     </thead>
     <tbody>
+
     <!--@foreach($mid_list as $key => $val)-->
     <tr>
         <td class="nowrap center">