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

classes/db/DB.class.php

@@ -118,14 +118,14 @@
          * @brief 로그 남김 
          **/
         function actStart($query) {
-            if(__DEBUG__ < 2 && !defined('__STOP_DEBUG__')) return;
+            if(__DEBUG__ < 2) return;
             $this->setError(0,'success');
             $this->query = $query;
             $this->act_start = getMicroTime();
         }
 
         function actFinish() {
-            if(__DEBUG__ < 2 || !$this->query || defined('__STOP_DEBUG__')) return;
+            if(__DEBUG__ < 2 || !$this->query ) return;
             $this->act_finish = getMicroTime();
             $elapsed_time = $this->act_finish - $this->act_start;
             $GLOBALS['__db_elapsed_time__'] += $elapsed_time;

classes/display/DisplayHandler.class.php

@@ -156,7 +156,7 @@
          * tail -f ./files/_debug_message.php로 하여 console로 확인하면 편리함\n
          **/
         function _debugOutput() {
-            if(!__DEBUG__ || Context::getResponseMethod()!='HTML') return;
+            if(!__DEBUG__ || (__DEBUG_OUTPUT!=0 && Context::getResponseMethod()!='HTML') ) return;
             $end = getMicroTime();
 
             // debug string 작성 시작

classes/template/TemplateHandler.class.php

@@ -19,7 +19,7 @@
          * @brief TemplateHandler의 기생성된 객체를 return
          **/
         function &getInstance() {
-            if(__DEBUG__==3 && !defined('__STOP_DEBUG__')) {
+            if(__DEBUG__==3 ) {
                 if(!isset($GLOBALS['__TemplateHandlerCalled__'])) $GLOBALS['__TemplateHandlerCalled__']=1;
                 else $GLOBALS['__TemplateHandlerCalled__']++;
             }
@@ -35,7 +35,7 @@
          **/
         function compile($tpl_path, $tpl_filename, $tpl_file = '') {
             // 디버그를 위한 컴파일 시작 시간 저장
-            if(__DEBUG__==3 && !defined('__STOP_DEBUG__') ) $start = getMicroTime();
+            if(__DEBUG__==3 ) $start = getMicroTime();
 
             // 변수 체크
             $tpl_path = ereg_replace('(\/+)$', '', $tpl_path).'/';
@@ -59,7 +59,7 @@
             // Context와 compiled_tpl_file로 컨텐츠 생성
             $output = $this->_fetch($compiled_tpl_file, $buff);
 
-            if(__DEBUG__==3 && !defined('__STOP_DEBUG__')) $GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
+            if(__DEBUG__==3 ) $GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
 
             return $output; 
         }

config/config.inc.php

@@ -24,7 +24,7 @@
      * 2 : 1 + DB 쿼리
      * 3 : 모든 로그
      **/
-    define('__DEBUG__', 1);
+    define('__DEBUG__', 3);
 
     /**
      * @brief 간단하게 사용하기 위한 함수 정의한 파일 require

modules/editor/tpl/css/editor.css

@@ -38,3 +38,10 @@ div.editor_autosaved_message { font-size:9pt; font-weight:bold; color:#888888; d
 .xeEditor .fileAttach .fileListArea .info strong { color:#ff6600; font:bold 1em Tahoma;}
 .xeEditor .fileAttach .fileUploadControl { float:left;}
 .xeEditor .fileAttach .fileUploadControl li { float:left; clear:both; margin-bottom:.3em;}
+
+.xeEditor .fileAttach .fileUploadControl .uploaderButton { display:block; cursor:pointer; background:url(../images/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; font-size:.9em; white-space:nowrap;}
+.xeEditor .fileAttach .fileUploadControl .uploaderButton:hover { text-decoration:none;}
+.xeEditor .fileAttach .fileUploadControl .uploaderButton img { vertical-align:middle;}
+.xeEditor .fileAttach .fileUploadControl .uploaderButton .leftCap { width:2px; height:21px; background:url(../images/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0;  position:relative; left:-1px;}
+.xeEditor .fileAttach .fileUploadControl .uploaderButton .rightCap { width:2px; height:21px; background:url(../images/buttonTypeBRight.gif) no-repeat; margin:0 -1px 0 .4em;}
+.xeEditor .fileAttach .fileUploadControl .uploaderButton .icon { margin:0 .2em;}

modules/editor/tpl/editor.html

@@ -142,10 +142,11 @@
         </div>
 
         <ul class="fileUploadControl">
-            <li><a href="#" onclick="editor_upload_file('{$upload_target_srl}');return false;" class="buttonTypeB"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->upload_file}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
+            <li><a href="#" onclick="editor_upload_file('{$upload_target_srl}');return false;" class="uploaderButton"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->upload_file}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
 
-            <li><a href="#" onclick="editor_remove_file('{$upload_target_srl}');return false;" class="buttonTypeB"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->delete_selected}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
+            <li><a href="#" onclick="editor_remove_file('{$upload_target_srl}');return false;" class="uploaderButton"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->delete_selected}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
-            <li><a href="#" onclick="editor_insert_file('{$upload_target_srl}');return false;" class="buttonTypeB"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->link_file}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
+
+            <li><a href="#" onclick="editor_insert_file('{$upload_target_srl}');return false;" class="uploaderButton"><img src="./images/blank.gif" alt="" class="leftCap" />{$lang->edit->link_file}<img src="./images/blank.gif" alt="" class="rightCap" /></a></li>
         </ul>
     </div>
     <!--@end-->

modules/importer/importer.admin.controller.php

@@ -96,9 +96,6 @@
             // 실행시간 무한대로 설정
             @set_time_limit(0);
 
-            // 디버그 메세지의 양이 무척 커지기에 디버그 메세지 생성을 중단
-            //define('__STOP_DEBUG__', true);
-
             // 변수 체크
             $this->module_srl = Context::get('module_srl');
             $this->category_srl = Context::get('category_srl');

modules/layout/layout.admin.controller.php

@@ -55,9 +55,8 @@
             if(count($menus)) {
                 foreach($menus as $menu_id => $val) {
                     $menu_srl = Context::get($menu_id);
-                    if($menu_srl) {
+                    if(!$menu_srl) continue;
-                        $menu_srl_list[] = $menu_srl;
+                    $menu_srl_list[] = $menu_srl;
-                    }
                 }
 
                 // 정해진 메뉴가 있으면 모듈 및 메뉴에 대한 레이아웃 연동

modules/menu/menu.admin.controller.php

@@ -123,9 +123,9 @@
             // XML 파일을 갱신하고 위치을 넘겨 받음
             $xml_file = $this->makeXmlFile($args->menu_srl);
 
-            // url에 mid=? 있을 경우 기록 남김
+            // url이 mid일 경우 기록 남김 
-            if(substr($args->url,0,4)=='mid=') {
+            if(eregi('^([a-zA-Z0-9\_\-]+)$', $args->url)) {
-                $mid = substr($args->url,4);
+                $mid = $args->url;
 
                 $mid_args->menu_srl = $args->menu_srl;
                 $mid_args->mid = $mid;
@@ -379,7 +379,7 @@
 
                 // 속성을 생성한다 ( url_list를 이용해서 선택된 메뉴의 노드에 속하는지를 검사한다. 꽁수지만 빠르고 강력하다고 생각;;)
                 $attribute = sprintf(
-                        '"node_srl"=>"%s","text"=>(%s?"%s":""),"href"=>(%s?"%s":""),"url"=>(%s?"%s":""),"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(%s&&in_array(Context::get("mid"),array(%s))?1:0),"list"=>array(%s)',
+                        '"node_srl"=>"%s","text"=>(%s?"%s":""),"href"=>(%s?"%s":""),"url"=>(%s?"%s":""),"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"list"=>array(%s)',
                         $node->menu_item_srl, 
                         $group_check_code,
                         $name,

modules/page/page.admin.controller.php

@@ -18,7 +18,7 @@
          **/
         function procPageAdminInsert() {
             // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            $args = Context::gets('module_srl','module_category_srl','page_name','browser_title','content','is_default');
+            $args = Context::gets('module_srl','module_category_srl','page_name','browser_title','content','is_default','layout_srl');
             $args->module = 'page';
             $args->mid = $args->page_name;
             unset($args->page_name);

modules/page/page.admin.view.php

@@ -136,6 +136,12 @@
             $editor = $oEditorModel->getEditor($module_srl, $option);
             Context::set('editor', $editor);
 
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+
             // 템플릿 파일 지정
             $this->setTemplateFile('page_insert');
         }

modules/page/tpl/page_insert.html

@@ -45,6 +45,20 @@
     <tr>
         <td>{$lang->about_browser_title}</td>
     </tr>
+    <tr>
+        <th rowspan="2">{$lang->layout}</th>
+        <td>
+            <select name="layout_srl">
+            <option value="0">{$lang->notuse}</option>
+            <!--@foreach($layout_list as $key => $val)-->
+            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="true"<!--@end-->>{$val->title} ({$val->layout})</option>
+            <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>{$lang->about_layout}</td>
+    </tr>
 
     <!--@if($module_info->is_default!='Y')-->
     <tr>