Changeset 10794

Timestamp:

Feb 18, 2009, 7:51:25 PM (13 years ago)

Author:

ShogoKawahara

Message:

#1163:「絞り込んだメンバーにメッセージ/Eメールを送る」のプロフィール項目に対応していなかったのを修正(trunk)

Location:

OpenPNE/trunk/webapp/modules/admin

Files:

• do/send_messages_search.php (modified) (1 diff)
• page/send_messages_search.php (modified) (1 diff)
• templates/list_c_member.tpl (modified) (1 diff)
• templates/send_messages_search.tpl (modified) (1 diff)

OpenPNE/trunk/webapp/modules/admin/do/send_messages_search.php

@@ -20 +20 @@
         $send_type = $requests['send_type'];
 
-        $cond_list = validate_cond($_REQUEST);
+        $cond_list = validate_cond($_REQUEST['cond']);
+        $profile_list = validate_profile_cond($_REQUEST['profile']);
 
         // 送信者はとりあえず1番で固定
         $c_member_id_from = 1;
-        $c_member_id_list = _db_admin_c_member_id_list($cond_list);
+        $c_member_id_list = _db_admin_c_member_id_list($cond_list, $profile_list);
 
         $send_num = 0;

OpenPNE/trunk/webapp/modules/admin/page/send_messages_search.php

@@ -10 +10 @@
     function execute($requests)
     {
-        $cond_list = validate_cond($_REQUEST);
+        $cond_list = validate_cond($_REQUEST['cond']);
+        $profile_cond_list = validate_profile_cond($_REQUEST['profile']);
 
         $profile_list = db_member_c_profile_list();
         $profile_value_list = array();
 
-        $special_keys = array('s_year', 'e_year',
-                              's_rank', 'e_rank',
-                              'last_login',
-                              'is_pc_address', 'is_ktai_address');
-        foreach ($cond_list as $key => $each_cond) {
-            if (in_array($key, $special_keys)) {
-                continue;
-            }
+        foreach ($profile_cond_list as $key => $each_cond) {
             $c_profile_option = db_c_profile_option4c_profile_option_id($each_cond);
             $profile_value_list[$key]['value'] = $c_profile_option['value'];
             $profile_value_list[$key]['caption'] = $profile_list[$key]['caption'];
         }
+
         $v['cond_list'] = $cond_list;
+        $v['profile_cond_list'] = $profile_cond_list;
         $v['profile_value_list'] = $profile_value_list;
 

OpenPNE/trunk/webapp/modules/admin/templates/list_c_member.tpl

@@ -288 +288 @@
 <input type="hidden" name="a" value="page_({$hash_tbl->hash('send_messages_search')})" />
 ({foreach from=$cond_list key=key item=item})
-<input type="hidden" name="({$key})" value="({$item})" />
-({/foreach})
-<input type="hidden" name="cond" value="({$cond})" />
+<input type="hidden" name="cond[({$key})]" value="({$item})" />
+({/foreach})
+({foreach from=$profile_cond_list key=key item=item})
+<input type="hidden" name="profile[({$key})]" value="({$item})" />
+({/foreach})
 ({else})
 <input type="hidden" name="a" value="page_({$hash_tbl->hash('send_messages_all')})" />

OpenPNE/trunk/webapp/modules/admin/templates/send_messages_search.tpl

@@ -49 +49 @@
 <input type="hidden" name="sessid" value="({$PHPSESSID})" />
 ({foreach from=$cond_list key=key item=item})
-<input type="hidden" name="({$key})" value="({$item})" />
+<input type="hidden" name="cond[({$key})]" value="({$item})" />
+({/foreach})
+({foreach from=$cond_list key=key item=item})
+<input type="hidden" name="profile[({$key})]" value="({$item})" />
 ({/foreach})
 <dl>