Index: members/members.module =================================================================== --- members/members.module (revision 195) +++ members/members.module (working copy) @@ -375,6 +375,14 @@ '#description' => t('Enter the URL to use for this members page. Do not begin or end the URL with a /. Example: \'members/premium\'.'), ); + $form['page-info']['page_type'] = array( + '#type' => 'select', + '#title' => t('Page type'), + '#default_value' => $member->page_type, + '#options' => array("table"=>"Table","list"=>"List") + ); + + $form['page-info']['page_title'] = array( '#type' => 'textfield', '#title' => t('Title'), @@ -764,10 +772,10 @@ if ($form['mid']) { - db_query("UPDATE {members_page} SET name='%s', description='%s', access='%s', page=%d, page_title='%s', url='%s', use_pager=%d, page_header='%s', page_header_format=%d, page_footer='%s', page_footer_format=%d, page_empty='%s', page_empty_format=%d, menu=%d, menu_title='%s', block=%d, block_title='%s', users_per_block=%d, block_more=%d, block_use_page_header=%d, block_header='%s', block_header_format=%d, block_use_page_footer=%d, block_footer='%s', block_footer_format=%d, block_use_page_empty=%d, block_empty='%s', block_empty_format=%d, roles='%s', `searchables`='%s', `fields`='%s', encode_mailto=%d, field_length=%d, users_per_page=%d WHERE mid=%d LIMIT 1", $form['name'], $form['description'], $access, $form['page'], $form['page_title'], $form['url'], $form['use_pager'], $form['page_header'], $form['page_header_format'], $form['page_footer'], $form['page_footer_format'], $form['page_empty'], $form['page_empty_format'], $form['menu'], $form['menu_title'], $form['block'], $form['block_title'], $form['users_per_block'], $form['block_more'], $form['block_use_page_header'], $form['block_header'], $form['block_header_format'], $form['block_use_page_footer'], $form['block_footer'], $form['blocker_footer_format'], $form['block_use_page_empty'], $form['block_empty'], $form['block_empty_format'], $roles, $searchables, $fields, $form['encode_mailto'], $form['field_length'], $form['users_per_page'], $form['mid']); + db_query("UPDATE {members_page} SET name='%s', description='%s', access='%s', page=%d, page_title='%s', url='%s', use_pager=%d, page_header='%s', page_header_format=%d, page_footer='%s', page_footer_format=%d, page_empty='%s', page_empty_format=%d, menu=%d, menu_title='%s', block=%d, block_title='%s', users_per_block=%d, block_more=%d, block_use_page_header=%d, block_header='%s', block_header_format=%d, block_use_page_footer=%d, block_footer='%s', block_footer_format=%d, block_use_page_empty=%d, block_empty='%s', block_empty_format=%d, roles='%s', `searchables`='%s', `fields`='%s', encode_mailto=%d, field_length=%d, users_per_page=%d, page_type='%s' WHERE mid=%d LIMIT 1", $form['name'], $form['description'], $access, $form['page'], $form['page_title'], $form['url'], $form['use_pager'], $form['page_header'], $form['page_header_format'], $form['page_footer'], $form['page_footer_format'], $form['page_empty'], $form['page_empty_format'], $form['menu'], $form['menu_title'], $form['block'], $form['block_title'], $form['users_per_block'], $form['block_more'], $form['block_use_page_header'], $form['block_header'], $form['block_header_format'], $form['block_use_page_footer'], $form['block_footer'], $form['blocker_footer_format'], $form['block_use_page_empty'], $form['block_empty'], $form['block_empty_format'], $roles, $searchables, $fields, $form['encode_mailto'], $form['field_length'], $form['users_per_page'],$form['page_type'], $form['mid']); } else { - db_query("INSERT INTO {members_page} (name, description, access, page, page_title, url, use_pager, page_header, page_header_format, page_footer, page_footer_format, page_empty, page_empty_format, menu, menu_title, block, block_title, users_per_block, block_more, block_use_page_header, block_header, block_header_format, block_use_page_footer, block_footer, block_footer_format, block_use_page_empty, block_empty, block_empty_format, roles, `fields`, `searchables`, encode_mailto, field_length, users_per_page) VALUES ('%s', '%s', '%s', %d, '%s', '%s', %d, '%s', %d, '%s', %d, '%s', %d, %d, '%s', %d, '%s', %d, %d, %d, '%s', %d, %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', %d, %d, %d)", $form['name'], $form['description'], $access, $form['page'], $form['page_title'], $form['url'], $form['use_pager'], $form['page_header'], $form['page_header_format'], $form['page_footer'], $form['page_footer_format'], $form['page_empty'], $form['page_empty_format'], $form['menu'], $form['menu_title'], $form['block'], $form['block_title'], $form['users_per_block'], $form['block_more'], $form['block_use_page_header'], $form['block_header'], $form['block_header_format'], $form['block_use_page_footer'], $form['block_footer'], $form['block_footer_format'], $form['block_use_page_empty'], $form['block_empty'], $form['block_empty_format'], $roles, $fields, $searchables, $form['encode_mailto'], $form['field_length'], $form['users_per_page']); + db_query("INSERT INTO {members_page} (name, description, access, page, page_title, url, use_pager, page_header, page_header_format, page_footer, page_footer_format, page_empty, page_empty_format, menu, menu_title, block, block_title, users_per_block, block_more, block_use_page_header, block_header, block_header_format, block_use_page_footer, block_footer, block_footer_format, block_use_page_empty, block_empty, block_empty_format, roles, `fields`, `searchables`, encode_mailto, field_length, users_per_page, page_type) VALUES ('%s', '%s', '%s', %d, '%s', '%s', %d, '%s', %d, '%s', %d, '%s', %d, %d, '%s', %d, '%s', %d, %d, %d, '%s', %d, %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', %d, %d, %d, '%s')", $form['name'], $form['description'], $access, $form['page'], $form['page_title'], $form['url'], $form['use_pager'], $form['page_header'], $form['page_header_format'], $form['page_footer'], $form['page_footer_format'], $form['page_empty'], $form['page_empty_format'], $form['menu'], $form['menu_title'], $form['block'], $form['block_title'], $form['users_per_block'], $form['block_more'], $form['block_use_page_header'], $form['block_header'], $form['block_header_format'], $form['block_use_page_footer'], $form['block_footer'], $form['block_footer_format'], $form['block_use_page_empty'], $form['block_empty'], $form['block_empty_format'], $roles, $fields, $searchables, $form['encode_mailto'], $form['field_length'], $form['users_per_page'],$form['page_type']); } if ($form['mid']) { @@ -791,20 +799,34 @@ * Load the members page settings in an object */ function members_load_settings($name = "") { + + static $members_settings; $settings = new stdClass(); - if(!empty($name)) { - if(!is_numeric($name)) { - $settings = db_fetch_object(db_query("SELECT * FROM {members_page} WHERE name='%s' LIMIT 1", $name)); - } - else { - $settings = db_fetch_object(db_query("SELECT * FROM {members_page} WHERE mid=%d LIMIT 1", $name)); - } - $settings->access = explode(",", $settings->access); - $settings->roles = explode(",", $settings->roles); - $settings->searchables =explode(",", $settings->searchables); - $settings->fields = explode(",", $settings->fields); + if(!is_array($members_settings)) { + $members_settings=array(); } + + if(!key_exists($name,$members_settings)) { + + if(!empty($name)) { + if(!is_numeric($name)) { + $settings = db_fetch_object(db_query("SELECT * FROM {members_page} WHERE name='%s' LIMIT 1", $name)); + } + else { + $settings = db_fetch_object(db_query("SELECT * FROM {members_page} WHERE mid=%d LIMIT 1", $name)); + } + $settings->access = explode(",", $settings->access); + $settings->roles = explode(",", $settings->roles); + $settings->searchables = strlen($settings->searchables) ? explode(",", $settings->searchables) : array(); + $settings->fields = explode(",", $settings->fields); + } + $members_settings[$name]=$settings; + } else { + $settings = $members_settings[$name]; + } + + return $settings; } @@ -1116,16 +1138,19 @@ } } $data = implode (', ', $data); + } elseif ($field == 'picture') { + $data = theme('user_picture',$account); } else { $data = $account->$field; } - + if (stristr($field, 'name')) { $data = l($data, 'user/'.$account->uid); } $row[] = array('data' => $data); } + $rows[] = $row; } @@ -1133,7 +1158,11 @@ $rows[] = array(array("data" => $pager, "colspan" => count($header))); } - $output = drupal_get_form('members_search_form',$mid); + if ( sizeof($member->searchables) > 0 ) { + $output = drupal_get_form('members_search_form',$mid); + } else { + $output = ''; + } // Render header @@ -1145,7 +1174,11 @@ } // Render main content - $output .= '
'. theme("table", $header, $rows) .'
'; + if(!$member->page_type || $member->page_type == 'table') { + $output .= '
'. theme("table", $header, $rows) .'
'; + } elseif ($member->page_type == 'list') { + $output .= '
'. theme('members_view_list',$member, $header, $rows) .'
'; + } // Render 'more' link @@ -1187,8 +1220,6 @@ $member = members_load_settings($mid); - $roles = $member->roles; - $output = ""; $form['filter'] = array( @@ -1203,67 +1234,64 @@ '#value' => $mid, ); - if ($roles) { - $fields = array(); - $enabled_fields = $member->fields; - $all_fields = _members_fields(); + $enabled_fields = $member->fields; + $all_fields = _members_fields(); + + + if($_POST['op']=='Reset Filter') { + unset($_SESSION['members_search_form'][$mid]); + drupal_goto($_GET['q']); // reload this page + } else { + $defaults = $_SESSION['members_search_form'][$mid]; + } + - - if($_POST['op']=='Reset Filter') { - unset($_SESSION['members_search_form'][$mid]); - drupal_goto($_GET['q']); // reload this page - } else { - $defaults = $_SESSION['members_search_form'][$mid]; - } - + foreach ($member->searchables as $field ) { + $field_info = _search_item_type($field); - foreach ($member->searchables as $field ) { - $field_info = _search_item_type($field); + $field_name = $field; + $title = $field_info['title']; + $options = $field_info['options']; + + + switch($field_info['type']) { + case 'bool': + $form['filter'][$field_name] = array( + '#type' => 'select', + '#title' => $title, + '#options' => array('any'=>'Any','yes'=>'Yes'), + '#default_value' => $defaults[$field_name] + ); + break; + case 'selection': + $form['filter'][$field_name] = array( + '#type' => 'select', + '#title' => $title, + '#options' => $options, + '#default_value' => $defaults[$field_name] + ); + break; - $field_name = $field; - $title = $field_info['title']; - $options = $field_info['options']; - - - switch($field_info['type']) { - case 'bool': - $form['filter'][$field_name] = array( - '#type' => 'select', - '#title' => $title, - '#options' => array('any'=>'Any','yes'=>'Yes'), - '#default_value' => $defaults[$field_name] - ); - break; - case 'selection': - $form['filter'][$field_name] = array( - '#type' => 'select', - '#title' => $title, - '#options' => $options, - '#default_value' => $defaults[$field_name] - ); - break; - - case 'textfield': - $form['filter'][$field_name] = array( - '#type' => 'textfield', - '#title' => $title, - '#default_value' => $defaults[$field_name] - ); - break; - } - - if ( $field_info['#autocomplete_path'] ) { - $form['filter'][$field_name]['#autocomplete_path'] = $field_info['#autocomplete_path']; - } - + case 'textfield': + $form['filter'][$field_name] = array( + '#type' => 'textfield', + '#title' => $title, + '#default_value' => $defaults[$field_name] + ); + break; } - $form['filter']['submit'] = array('#type' => 'submit', '#value' =>t('Search')); + if ( $field_info['#autocomplete_path'] ) { + $form['filter'][$field_name]['#autocomplete_path'] = $field_info['#autocomplete_path']; + } - $form['filter']['reset'] = array('#type' => 'button', '#value' =>t('Reset Filter')); - - } + } + $form['filter']['submit'] = array('#type' => 'submit', '#value' =>t('Search')); + + $form['filter']['reset'] = array('#type' => 'button', '#value' =>t('Reset Filter')); + + return $form; } @@ -1502,3 +1530,22 @@ } } + +function theme_members_view_list($member, $fields, $data) { + + $output = ''; + if($member->use_pager) { + $pager = $data[sizeof($data)-1][0]['data']; + unset($data[sizeof($data)-1]); + } + + foreach( $data as $user ) { + $output .= theme('item_list', $user); + } + + if($member->use_pager){ + $output .= $pager; + } + + return $output; +} Index: members/members.install =================================================================== --- members/members.install (revision 195) +++ members/members.install (working copy) @@ -93,6 +93,14 @@ return $ret; } +function members_update_3() { + $ret = array(); + + db_add_column($ret, 'members_page', 'page_type', 'varchar(20)'); + + return $ret; +} + function members_uninstall() { if (db_table_exists('members_page')) { db_query("DROP TABLE {members_page}"); Index: members/contrib/membersuser/membersuser.info =================================================================== --- members/contrib/membersuser/membersuser.info (revision 0) +++ members/contrib/membersuser/membersuser.info (revision 199) @@ -0,0 +1,4 @@ +name = Members User +description = Provides members module with fields from user information +dependencies = members + Index: members/contrib/membersuser/membersuser.module =================================================================== --- members/contrib/membersuser/membersuser.module (revision 0) +++ members/contrib/membersuser/membersuser.module (revision 199) @@ -0,0 +1,81 @@ + 'User ID (UID)','type'=>'textfield'); + $fields['has_posted'] = array('title'=> 'Has Posted Content','type'=>'bool','searchable'=>true); + return $fields; + break; + + case 'process': + if($a == 'has_posted') { + db_query("CREATE TEMPORARY TABLE {%s} (uid int, %s int, INDEX (uid), INDEX(%s))",$b,$a,$a); + db_query('INSERT INTO {%s} SELECT uid,uid FROM {node} GROUP BY uid',$b); + return true; + } else { + return false; + } + + + break; + } +} + +/** + * hook_theme + * + * @param $account row from table join + * @param $field_id id of field for profile module reference + * @param $row_value value of the join in the current members row + * @return string with better representation of the row + * + * because we are using profile module for the data, we just need to pass + * the account and the field_id (name) and it will return the value for us + * + */ +function theme_membersuser_field($account, $field_id) { + static $node_uids; + + if($field_id == 'uid') { + return $account->uid; + } elseif ($field_id == 'has_posted') { + // get all the results of users in one shot and use for later + if( ! is_array($node_uids) ) { + $result=db_query('SELECT uid,count(*) as c FROM {node} group by uid'); + while($row = db_fetch_object($result)) { + $node_uids[$row->uid]=$row->c; + } + } + + if (!$node_uids[$account->uid]) { + return 'No'; + } else { + return 'Yes'; + } + + } + + return $data; + +}