group image

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

modules/member/member.admin.controller.php

@@ -406,7 +406,7 @@
             $oModuleControll = getController('module');
 
             $config = $oModuleModel->getModuleConfig('member');
-            $config->group_image_mark_order = Context::get('group_image_mark_order');
+//            $config->group_image_mark_order = Context::get('group_image_mark_order');
 
             $oModuleControll->insertModuleConfig('member', $config);
         }

modules/member/member.class.php

@@ -56,6 +56,8 @@
             if(!$args->image_mark_max_height) $args->image_mark_max_height = '20';
             if(!$args->profile_image_max_width) $args->profile_image_max_width = '80';
             if(!$args->profile_image_max_height) $args->profile_image_max_height = '80';
+            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
+
             $oModuleController->insertModuleConfig('member',$args);
 
             // 멤버 컨트롤러 객체 생성

modules/member/member.model.php

@@ -186,9 +186,16 @@
          **/
         function arrangeMemberInfo($info, $site_srl = 0) {
             if(!$GLOBALS['__member_info__'][$info->member_srl]) {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
+
+
                 $info->profile_image = $this->getProfileImage($info->member_srl);
                 $info->image_name = $this->getImageName($info->member_srl);
                 $info->image_mark = $this->getImageMark($info->member_srl);
+                if($config->group_image_mark=='Y'){
+                    $info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+                }
                 $info->signature = $this->getSignature($info->member_srl);
                 $info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
 
@@ -319,17 +326,21 @@
          * @brief 그룹 목록을 가져옴
          **/
         function getGroups($site_srl = 0) {
-            $args->site_srl = $site_srl;
+            if(!$GLOBALS['__group_info__'][$site_srl]) {
-            $output = executeQuery('member.getGroups', $args);
+                $args->site_srl = $site_srl;
-            if(!$output->data) return;
+                $output = executeQuery('member.getGroups', $args);
+                if(!$output->data) return;
 
-            $group_list = $output->data;
+                $group_list = $output->data;
-            if(!is_array($group_list)) $group_list = array($group_list);
+                if(!is_array($group_list)) $group_list = array($group_list);
 
-            foreach($group_list as $val) {
+                foreach($group_list as $val) {
-                $result[$val->group_srl] = $val;
+                    $result[$val->group_srl] = $val;
+                }
+
+                $GLOBALS['__group_info__'][$site_srl] = $result;
             }
-            return $result;
+            return $GLOBALS['__group_info__'][$site_srl];
         }
 
         /**
@@ -552,9 +563,33 @@
                     $GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
                 } else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
             }
+
             return $GLOBALS['__member_info__']['image_mark'][$member_srl];
         }
 
+
+        /**
+         * @brief group의 이미지마크 정보를 구함
+         **/
+        function getGroupImageMark($member_srl,$site_srl=0) {
+           $member_group = $this->getMemberGroups($member_srl,$site_srl);
+
+           $groups_info = $this->getGroups($site_srl);
+           $image_mark = null;
+           if(count($member_group) > 0 && is_array($member_group)){
+               $group_srl = array_keys($member_group);
+               $image_mark = $groups_info[$group_srl[0]]->image_mark;
+           }
+           if($image_mark){
+                list($width, $height, $type, $attrs) = getimagesize($image_mark);
+                $info->width = $width;
+                $info->height = $height;
+                $info->src = $image_mark;
+                return $info;
+
+           }else return false;
+        }
+
         /**
          * @brief 사용자의 signature를 구함
          **/

modules/member/tpl/group_list.html

@@ -31,7 +31,7 @@
     <!--@end-->
     <!--@foreach($group_list as $group_srl => $group_info)-->
     <tr class="row{$cycle_idx}">
-        <td><!--@if($group_info->image_mark)--><img src="{$group_info->image_mark}" width="{$config->group_image_mark_max_width}" height="{$config->group_image_mark_max_height}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
+        <td><!--@if($config->group_image_mark=='Y' && $group_info->image_mark)--><img src="{$group_info->image_mark}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
         <td>{nl2br($group_info->description)}&nbsp;</td>
         <td>{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
         <td><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
@@ -67,42 +67,21 @@
         <th scope="row"><div>{$lang->description}</div></th>
         <td><textarea name="description" class="inputTypeTextArea w400"></textarea></td>
     </tr>
+
     <tr class="row2">
         <th scope="row"><div>{$lang->group_image_mark}</div></th>
         <td class="left">
-            <div id="filebox_preview_image_mark" style="width:{$config->group_image_mark_max_width}px;height:{$config->group_image_mark_max_height}px;display:none"></div>
+            <div id="filebox_preview_image_mark" style="width:100px;height:100px;display:none"></div>
             <input type="hidden" name="image_mark" value="" />
             <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
             <span id="filebox_cancel_image_mark" class="button red" style="display:none"><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
         </td>
     </tr>
+
     <tr>
         <th colspan="2" class="button">
             <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
         </th>
     </tr>
     </table>
-</form>
+</form>
-
-
-<h4 class="xeAdmin">{$lang->group_image_mark_order}</h4>
-<!--@if(count($group_list))-->
-<ol id="group_image_mark_order">
-<!--@if(count($config->group_image_mark_order))-->
-    <!--@foreach($config->group_image_mark_order as $group_srl)-->
-        <li id="group_srl_{$group_srl}" class="<!--@if(!$group_list[$group_srl]->image_mark)-->inactive<!--@else-->active<!--@end-->"><!--@if($group_list[$group_srl]->image_mark)--><img src="{$group_list[$group_srl]->image_mark}" width="{$config->group_image_mark_max_width}" height="{$config->group_image_mark_max_height}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_list[$group_srl]->title}</li>
-    <!--@endforeach-->
-<!--@endif-->
-<!--@foreach($group_list as $group)-->
-    <!--@if(!in_array($group->group_srl, $config->group_image_mark_order))-->
-    <li id="group_srl_{$group->group_srl}" class="<!--@if(!$group->image_mark)-->inactive<!--@else-->active<!--@end-->"><!--@if($group->image_mark)--><img src="{$group->image_mark}" width="{$config->group_image_mark_max_width}" height="{$config->group_image_mark_max_height}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group->title}</li>
-    <!--@endif-->
-<!--@endforeach-->
-</ol>
-<!--@endif-->
-
-<div class="clear">
-    <div class="fr">
-        <a href="#" class="button black" onclick="doGorupImageMarkUpdateOrder('group_image_mark_order'); return false;"><span>{$lang->cmd_registration}</span></a>
-    </div>
-</div>

modules/member/tpl/group_update_form.html

@@ -26,7 +26,7 @@
     <tr>
         <th scope="row"><div>{$lang->group_image_mark}</div></th>
         <td class="left">
-            <div id="filebox_preview_image_mark" style="width:{$config->group_image_mark_max_width}px;height:{$config->group_image_mark_max_height}px;<!--@if(!$selected_group->image_mark)-->display:none<!--@endif-->"></div>
+            <div id="filebox_preview_image_mark" style="width:100px;height:100px;<!--@if(!$selected_group->image_mark)-->display:none<!--@endif-->"></div>
             <input type="hidden" name="image_mark" value="{$selected_group->image_mark}" />
             <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
             <span id="filebox_cancel_image_mark" class="button red"<!--@if(!$selected_group->image_mark)--> style="display:none" <!--@endif-->><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>

modules/member/tpl/member_config.html

@@ -90,8 +90,6 @@
             <input type="checkbox" name="group_image_mark" value="Y" <!--@if($config->group_image_mark=='Y')-->checked="checked"<!--@end--> class="checkbox"/>
             {$lang->about_group_image_mark}
         </p>
-        {$lang->group_image_mark_max_width} : <input type="text" name="group_image_mark_max_width" size="3" value="{$config->group_image_mark_max_width}" class="inputTypeText"/>px<br />
-        {$lang->group_image_mark_max_height} : <input type="text" name="group_image_mark_max_height" size="3" value="{$config->group_image_mark_max_height}" class="inputTypeText"/>px<br />
     </td>
 </tr>
 <tr class="row2">