#227 서명의 높이(height)제한 설정 추가

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

modules/member/lang/ko.lang.php

@@ -41,6 +41,7 @@
     $lang->image_mark = '이미지 마크';
     $lang->image_mark_max_width = '가로 제한 크기';
     $lang->image_mark_max_height = '세로 제한 크기';
+    $lang->signature_max_height = '서명 높이 제한';
     $lang->enable_openid = 'OpenID 지원';
     $lang->enable_join = '회원 가입 허가';
     $lang->limit_day = '임시 제한 일자';
@@ -186,6 +187,7 @@
     $lang->about_image_name = '사용자의 이름을 글자 대신 이미지로 사용할 수 있게 합니다';
     $lang->about_image_mark = '사용자의 이름앞에 마크를 달 수 있습니다';
     $lang->about_profile_image = '사용자의 프로필 이미지를 사용할 수 있게 합니다';
+    $lang->about_signature_max_height = '서명란의 높이를 제한 할 수 있습니다. (0 또는 비워두면 제한하지 않습니다)';
     $lang->about_accept_agreement = '약관을 모두 읽었으며 동의합니다'; 
 
     $lang->about_member_default = '회원가입시 기본 그룹으로 설정됩니다';

modules/member/member.admin.controller.php

@@ -83,7 +83,7 @@
          **/
         function procMemberAdminInsertConfig() {
             // 기본 정보를 받음
-            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','limit_day','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height');
+            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','limit_day','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height');
             if(!$args->skin) $args->skin = "default";
             if(!$args->colorset) $args->colorset = "white";
             if($args->enable_join!='Y') $args->enable_join = 'N';

modules/member/member.controller.php

@@ -1592,6 +1592,9 @@
          * member_extra_info 애드온에서 요청이 됨
          **/
         function transSignature($matches) {
+            $oModuleModel = &getModel('module');
+            $memberModuleConfig = $oModuleModel->getModuleConfig('member');
+            
             $member_srl = $matches[2];
             if(!$member_srl) return $matches[0];
 
@@ -1606,8 +1609,17 @@
                 $profile_image = $oMemberModel->getProfileImage($member_srl);
                 if($profile_image->src) $signature = sprintf('<img src="%s" width="%d" height="%d" alt="" class="member_profile_image" />%s', $profile_image->src, $profile_image->width, $profile_image->height, $signature);
 
-                if($signature) $GLOBALS['_transSignatureList'][$member_srl] = sprintf('<div class="member_signature">%s<div class="clear"></div></div>', $signature);
+                // 서명이 있으면 반환
-                else $GLOBALS['_transSignatureList'][$member_srl] = null;
+                if($signature) {
+                    // 서명 높이 제한 값이 있으면 표시 높이 제한
+                    if($memberModuleConfig->signature_max_height) {
+                        $GLOBALS['_transSignatureList'][$member_srl] = sprintf('<div class="member_signature" style="max-height: %spx; overflow: hidden; height: expression(this.scrollHeight > %s? \'%spx\': \'auto\');">%s<div class="clear"></div></div>', $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $signature);
+                    } else {
+                        $GLOBALS['_transSignatureList'][$member_srl] = sprintf('<div class="member_signature">%s<div class="clear"></div></div>', $signature);
+                    }
+                } else {
+                    $GLOBALS['_transSignatureList'][$member_srl] = null;
+                }
             }
 
             return $GLOBALS['_transSignatureList'][$member_srl].$matches[0];

modules/member/member.view.php

@@ -84,6 +84,8 @@
          **/
         function dispMemberModifyInfo() {
             $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            $memberModuleConfig = $oModuleModel->getModuleConfig('member');
 
             // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
             if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@@ -108,6 +110,7 @@
                 $option->enable_default_component = true;
                 $option->enable_component = false;
                 $option->resizable = false;
+                if($memberModuleConfig->signature_max_height)
                 $option->height = 200;
                 $editor = $oEditorModel->getEditor($member_info->member_srl, $option);
                 Context::set('editor', $editor);

modules/member/tpl/member_config.html

@@ -77,6 +77,13 @@
             {$lang->image_mark_max_height} : <input type="text" name="image_mark_max_height" size="3" value="{$config->image_mark_max_height}" class="inputTypeText"/>px<br />
         </td>
     </tr>
+    <tr>
+        <th scope="row">{$lang->signature_max_height}</th>
+        <td>
+            <input type="text" name="signature_max_height" size="3" value="{$config->signature_max_height}" class="inputTypeText"/>px
+            <p>{$lang->about_signature_max_height}</p>
+        </td>
+    </tr>
     <tr>
         <th scope="row">{$lang->redirect_url}</th>
         <td>