From 17c17807cc0b63d322d56acfae4f30399041cdb5 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 02:33:55 +0000 Subject: Standardized files git-svn-id: http://code.elgg.org/elgg/trunk@3553 36083f99-b078-4883-b0ff-0f9b5a30f544 --- search/groups.php | 67 +++++++++++------------ search/index.php | 156 +++++++++++++++++++++++++++--------------------------- search/users.php | 67 +++++++++++------------ 3 files changed, 140 insertions(+), 150 deletions(-) (limited to 'search') diff --git a/search/groups.php b/search/groups.php index 4b0825d79..c31e421f0 100644 --- a/search/groups.php +++ b/search/groups.php @@ -1,40 +1,35 @@ $tag)); - $body .= list_group_search($tag); - //$body = elgg_view_layout('two_column_left_sidebar','',$body); - } else { - $title = elgg_echo('item:group'); - $body .= elgg_view_title($title); - $body .= list_entities('groups'); - } - - $body = elgg_view_layout('two_column_left_sidebar','',$body); - page_draw($title,$body); +// Set context +set_context('search'); -?> \ No newline at end of file +// Get input +$tag = stripslashes(get_input('tag')); + +if (!empty($tag)) { + $title = sprintf(elgg_echo('groups:searchtitle'),$tag); + $body = ""; + $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag)); + $body .= elgg_view('group/search/startblurb',array('tag' => $tag)); + $body .= list_group_search($tag); + //$body = elgg_view_layout('two_column_left_sidebar','',$body); +} else { + $title = elgg_echo('item:group'); + $body .= elgg_view_title($title); + $body .= list_entities('groups'); +} + +$body = elgg_view_layout('two_column_left_sidebar','',$body); +page_draw($title,$body); \ No newline at end of file diff --git a/search/index.php b/search/index.php index 4366ade31..9ae3533d6 100644 --- a/search/index.php +++ b/search/index.php @@ -1,85 +1,85 @@ 0) { + if ($friends = get_user_friends($friends,'',9999)) { + $owner_guid_array = array(); + foreach($friends as $friend) { + $owner_guid_array[] = $friend->guid; } - $friends = (int) get_input('friends',0); - if ($friends > 0) { - if ($friends = get_user_friends($friends,'',9999)) { - $owner_guid_array = array(); - foreach($friends as $friend) { - $owner_guid_array[] = $friend->guid; + } else { + $owner_guid = -1; + } +} + +// Set up submenus +if ($object_types = get_registered_entity_types()) { + foreach($object_types as $object_type => $subtype_array) { + if (is_array($subtype_array) && sizeof($subtype_array)) + foreach($subtype_array as $object_subtype) { + $label = 'item:' . $object_type; + if (!empty($object_subtype)) { + $label .= ':' . $object_subtype; } - } else { - $owner_guid = -1; - } - } - - // Set up submenus - if ($object_types = get_registered_entity_types()) { - - foreach($object_types as $object_type => $subtype_array) { - if (is_array($subtype_array) && sizeof($subtype_array)) - foreach($subtype_array as $object_subtype) { - $label = 'item:' . $object_type; - if (!empty($object_subtype)) $label .= ':' . $object_subtype; - global $CONFIG; - add_submenu_item(elgg_echo($label), $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&subtype=" . $object_subtype . "&object=". urlencode($object_type) ."&tagtype=" . urlencode($md_type) . "&owner_guid=" . urlencode($owner_guid)); - } + global $CONFIG; + add_submenu_item(elgg_echo($label), $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&subtype=" . $object_subtype . "&object=". urlencode($object_type) ."&tagtype=" . urlencode($md_type) . "&owner_guid=" . urlencode($owner_guid)); } - add_submenu_item(elgg_echo('all'), $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&owner_guid=" . urlencode($owner_guid)); - - } - - if (empty($objecttype) && empty($subtype)) { - $title = sprintf(elgg_echo('searchtitle'),$tag); - } else { - if (empty($objecttype)) $objecttype = 'object'; - $itemtitle = 'item:' . $objecttype; - if (!empty($subtype)) $itemtitle .= ':' . $subtype; - $itemtitle = elgg_echo($itemtitle); - $title = sprintf(elgg_echo('advancedsearchtitle'),$itemtitle,$tag); - } - - if (!empty($tag)) { - $body = ""; - $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag)); - $body .= trigger_plugin_hook('search','',$tag,""); - $body .= elgg_view('search/startblurb',array('tag' => $tag)); - $body .= list_entities_from_metadata($md_type, elgg_strtolower($tag), $objecttype, $subtype, $owner_guid_array, 10, false, false); - $body = elgg_view_layout('two_column_left_sidebar','',$body); - } - - page_draw($title,$body); + } + add_submenu_item(elgg_echo('all'), $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&owner_guid=" . urlencode($owner_guid)); + +} + +if (empty($objecttype) && empty($subtype)) { + $title = sprintf(elgg_echo('searchtitle'),$tag); +} else { + if (empty($objecttype)) { + $objecttype = 'object'; + } + $itemtitle = 'item:' . $objecttype; + if (!empty($subtype)) { + $itemtitle .= ':' . $subtype; + } + $itemtitle = elgg_echo($itemtitle); + $title = sprintf(elgg_echo('advancedsearchtitle'),$itemtitle,$tag); +} + +if (!empty($tag)) { + $body = ""; + $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag)); + $body .= trigger_plugin_hook('search','',$tag,""); + $body .= elgg_view('search/startblurb',array('tag' => $tag)); + $body .= list_entities_from_metadata($md_type, elgg_strtolower($tag), $objecttype, $subtype, $owner_guid_array, 10, false, false); + $body = elgg_view_layout('two_column_left_sidebar','',$body); +} -?> \ No newline at end of file +page_draw($title,$body); \ No newline at end of file diff --git a/search/users.php b/search/users.php index 5be11e020..62296e7e7 100644 --- a/search/users.php +++ b/search/users.php @@ -1,40 +1,35 @@ $tag)); - $body .= list_user_search($tag); - //$body = elgg_view_layout('two_column_left_sidebar','',$body); - } else { - $title = elgg_echo('item:user'); - $body .= elgg_view_title($title); - $body .= list_entities('user'); - } - - $body = elgg_view_layout('two_column_left_sidebar','',$body); - page_draw($title,$body); +// Set context +set_context('search'); -?> \ No newline at end of file +// Get input +$tag = stripslashes(get_input('tag')); + +if (!empty($tag)) { + $title = sprintf(elgg_echo('users:searchtitle'),$tag); + $body = ""; + $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag)); + $body .= elgg_view('user/search/startblurb',array('tag' => $tag)); + $body .= list_user_search($tag); + //$body = elgg_view_layout('two_column_left_sidebar','',$body); +} else { + $title = elgg_echo('item:user'); + $body .= elgg_view_title($title); + $body .= list_entities('user'); +} + +$body = elgg_view_layout('two_column_left_sidebar','',$body); +page_draw($title,$body); \ No newline at end of file -- cgit v1.2.3