diff options
Diffstat (limited to 'mod/members')
| -rw-r--r-- | mod/members/manifest.xml | 9 | ||||
| -rw-r--r-- | mod/members/pages/members/index.php | 1 | ||||
| -rw-r--r-- | mod/members/pages/members/search.php | 25 | ||||
| -rw-r--r-- | mod/members/start.php | 2 |
4 files changed, 24 insertions, 13 deletions
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml index b96684198..8b18c9f91 100644 --- a/mod/members/manifest.xml +++ b/mod/members/manifest.xml @@ -7,11 +7,10 @@ <description>Lists the members of your site</description> <website>http://www.elgg.org/</website> <copyright>See COPYRIGHT.txt</copyright> - <license>GNU Public License version 2</license> + <license>GNU General Public License version 2</license> <requires> - <type>elgg_version</type> - <version>2010030101</version> + <type>elgg_release</type> + <version>1.8</version> </requires> <activate_on_install>true</activate_on_install> - <admin_interface>advanced</admin_interface> -</plugin_manifest>
\ No newline at end of file +</plugin_manifest> diff --git a/mod/members/pages/members/index.php b/mod/members/pages/members/index.php index 4f23c6322..330ef66bf 100644 --- a/mod/members/pages/members/index.php +++ b/mod/members/pages/members/index.php @@ -28,7 +28,6 @@ $params = array( 'content' => $content, 'sidebar' => elgg_view('members/sidebar'), 'title' => $title . " ($num_members)", - 'buttons' => '', 'filter_override' => elgg_view('members/nav', array('selected' => $vars['page'])), ); diff --git a/mod/members/pages/members/search.php b/mod/members/pages/members/search.php index 39b54990e..5466a8246 100644 --- a/mod/members/pages/members/search.php +++ b/mod/members/pages/members/search.php @@ -7,7 +7,9 @@ if ($vars['search_type'] == 'tag') { $tag = get_input('tag'); - $title = elgg_echo('members:title:searchtag', array($tag)); + $display_query = _elgg_get_display_query($tag);
+ + $title = elgg_echo('members:title:searchtag', array($display_query)); $options = array(); $options['query'] = $tag; @@ -17,18 +19,27 @@ if ($vars['search_type'] == 'tag') { $results = elgg_trigger_plugin_hook('search', 'tags', $options, array()); $count = $results['count']; $users = $results['entities']; - $content = elgg_view_entity_list($users, $count, $offset, $limit, false, false, true); + $content = elgg_view_entity_list($users, array( + 'count' => $count, + 'offset' => $offset, + 'limit' => $limit, + 'full_view' => false, + 'list_type_toggle' => false, + 'pagination' => true, + )); } else { - $name = get_input('name'); + $name = sanitize_string(get_input('name')); + + $display_query = _elgg_get_display_query($name); - $title = elgg_echo('members:title:searchname', array($name)); + $title = elgg_echo('members:title:searchname', array($display_query)); - global $CONFIG; + $db_prefix = elgg_get_config('dbprefix'); $params = array( 'type' => 'user', 'full_view' => false, - 'joins' => array("join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid"), - 'wheres' => array("(u.name like \"%{$name}%\" or u.username like \"%{$name}%\")"), + 'joins' => array("JOIN {$db_prefix}users_entity u ON e.guid=u.guid"), + 'wheres' => array("(u.name LIKE \"%{$name}%\" OR u.username LIKE \"%{$name}%\")"), ); $content .= elgg_list_entities($params); } diff --git a/mod/members/start.php b/mod/members/start.php index 2c1793c17..54787cd16 100644 --- a/mod/members/start.php +++ b/mod/members/start.php @@ -19,6 +19,7 @@ function members_init() { * Members page handler * * @param array $page url segments + * @return bool */ function members_page_handler($page) { $base = elgg_get_plugins_path() . 'members/pages/members'; @@ -36,4 +37,5 @@ function members_page_handler($page) { } else { require_once "$base/index.php"; } + return true; } |