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/message/message.admin.view.php

@@ -1,3 +1,4 @@
+<<<<<<< .working
 <?php
     /**
      * @class  messageAdminView
@@ -31,3 +32,45 @@
 
     }
 ?>
+=======
+<?php
+    /**
+     * @class  messageAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief  message모듈의 admin view class
+     **/
+
+    class messageAdminView extends message {
+
+        /**
+         * @brief 초기화
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief 설정 
+         **/
+        function dispMessageAdminConfig() {
+            // 스킨 목록을 구해옴
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getskins($this->module_path);
+            Context::set('skin_list', $skin_list);
+
+            // 설정 정보를 받아옴 (module model 객체를 이용)
+            $config = $oModuleModel->getModuleConfig('message');
+            Context::set('config',$config);
+
+            // 템플릿 파일 지정
+            $this->setTemplatePath($this->module_path.'tpl');
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('skin_list..title');				
+			
+            $this->setTemplateFile('config');
+        }
+
+    }
+?>
+>>>>>>> .merge-right.r9269