aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engine/lib/elgglib.php4
-rw-r--r--engine/lib/entities.php34
-rw-r--r--engine/lib/search.php50
-rw-r--r--engine/schema/upgrades/2009093001.sql11
-rw-r--r--mod/search/index.php132
-rw-r--r--mod/search/languages/en.php8
-rw-r--r--mod/search/manifest.xml10
-rw-r--r--mod/search/start.php117
-rw-r--r--mod/search/views/default/page_elements/searchbox.php4
-rw-r--r--mod/search/views/default/search/css.php61
-rw-r--r--mod/search/views/default/search/entity_list.php (renamed from views/default/search/entity_list.php)128
-rw-r--r--mod/search/views/default/search/gallery.php (renamed from views/default/search/gallery.php)102
-rw-r--r--mod/search/views/default/search/listing.php35
-rw-r--r--views/default/page_elements/elgg_topbar.php7
-rw-r--r--views/default/search/gallery_listing.php35
-rw-r--r--views/default/search/listing.php45
-rw-r--r--views/default/search/startblurb.php8
17 files changed, 536 insertions, 255 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index fc87c1dc1..b2a157155 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -719,7 +719,7 @@
$context = get_context();
- $html = elgg_view('search/entity_list',array(
+ $html = elgg_view('entities/entity_list',array(
'entities' => $entities,
'count' => $count,
'offset' => $offset,
@@ -1000,7 +1000,7 @@
* @return string The HTML (etc) representing the listing
*/
function elgg_view_listing($icon, $info) {
- return elgg_view('search/listing',array('icon' => $icon, 'info' => $info));
+ return elgg_view('entities/entity_listing',array('icon' => $icon, 'info' => $info));
}
/**
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index b72eb6ff0..55a675154 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -63,6 +63,13 @@
*/
protected $temp_annotations;
+
+ /**
+ * Volatile data structure for this object, allows for storage of data
+ * in-memory that isn't sync'd back to the metadata table.
+ */
+ protected $volatile;
+
/**
* Initialise the attributes array.
* This is vital to distinguish between metadata and base parameters.
@@ -79,6 +86,7 @@
if (!is_array($this->attributes)) $this->attributes = array();
if (!is_array($this->temp_metadata)) $this->temp_metadata = array();
if (!is_array($this->temp_annotations)) $this->temp_annotations = array();
+ if (!is_array($this->volatile)) $this->volatile = array();
$this->attributes['guid'] = "";
$this->attributes['type'] = "";
@@ -174,6 +182,31 @@
return true;
}
+
+ /**
+ * Get a piece of volatile (non-persisted) data on this entity
+ */
+ public function getVolatileData($name) {
+ if (!is_array($this->volatile)) $this->volatile = array();
+
+ if (array_key_exists($name, $this->volatile)) {
+ return $this->volatile[$name];
+ } else {
+ return NULL;
+ }
+ }
+
+
+ /**
+ * Get a piece of volatile (non-persisted) data on this entity
+ */
+ public function setVolatileData($name, $value) {
+ if (!is_array($this->volatile)) $this->volatile = array();
+
+ $this->volatile[$name] = $value;
+ }
+
+
/**
* Get a given piece of metadata.
*
@@ -686,6 +719,7 @@
{
// Create the array if necessary - all subclasses should test before creating
if (!is_array($this->attributes)) $this->attributes = array();
+ if (!is_array($this->volatile)) $this->volatile = array();
// Now put these into the attributes array as core values
$objarray = (array) $row;
diff --git a/engine/lib/search.php b/engine/lib/search.php
deleted file mode 100644
index 222c0b6e9..000000000
--- a/engine/lib/search.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
- /**
- * Elgg search helper functions.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.org/
- */
-
- /**
- * Initialise search helper functions.
- *
- */
- function search_init()
- {
- register_page_handler('search','search_page_handler');
- }
-
- /**
- * Page handler for search
- *
- * @param array $page Page elements from pain page handler
- */
- function search_page_handler($page)
- {
- global $CONFIG;
-
- if(!get_input('tag')) {
- set_input('tag', $page[0]);
- }
-
- if (isset($page[0])) {
- switch ($page[0]) {
- case 'user' :
- case 'users' : include_once($CONFIG->path . "search/users.php"); break;
-
- case 'group' :
- case 'groups' : include_once($CONFIG->path . "search/groups.php"); break;
-
- default: include_once($CONFIG->path . "search/index.php");
- }
- }
- else
- include_once($CONFIG->path . "search/index.php");
- }
-
- /** Register init system event **/
- register_elgg_event_handler('init','system','search_init');
-?>
diff --git a/engine/schema/upgrades/2009093001.sql b/engine/schema/upgrades/2009093001.sql
new file mode 100644
index 000000000..ce7bf96e4
--- /dev/null
+++ b/engine/schema/upgrades/2009093001.sql
@@ -0,0 +1,11 @@
+--Search Index
+CREATE TABLE IF NOT EXISTS `prefix_search_index`(
+ `guid` INT NOT NULL,
+ `subtype` VARCHAR( 32 ) NOT NULL,
+ `string` TEXT NOT NULL,
+ PRIMARY KEY (`guid`,`subtype`),
+ KEY `guid` (`guid`),
+ KEY `subtype` (`subtype`),
+ FULLTEXT KEY `string` (`string`)
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
diff --git a/mod/search/index.php b/mod/search/index.php
new file mode 100644
index 000000000..c6283d2f3
--- /dev/null
+++ b/mod/search/index.php
@@ -0,0 +1,132 @@
+<?php
+
+ /** Main search page */
+
+global $CONFIG;
+
+$tag = get_input('tag');
+$offset = get_input('offset', 0);
+$limit = get_input('limit', 10);
+$viewtype = get_input('search_viewtype','list');
+$searchtype = get_input('searchtype', 'all');
+$object_type = get_input('object_type', '');
+$subtype = get_input('subtype', '');
+$owner_guid = get_input('owner_guid', '');
+$tagtype = get_input('tagtype', '');
+$friends = (int)get_input('friends', 0);
+
+
+$title = sprintf(elgg_echo('searchtitle'), $tag);
+
+
+if (substr_count($owner_guid,',')) {
+ $owner_guid_array = explode(",",$owner_guid);
+} else {
+ $owner_guid_array = $owner_guid;
+}
+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 $ot => $subtype_array) {
+ if (is_array($subtype_array) && sizeof($subtype_array))
+ foreach($subtype_array as $object_subtype) {
+ $label = 'item:' . $ot;
+ if (!empty($object_subtype)) $label .= ':' . $object_subtype;
+ add_submenu_item(elgg_echo($label), $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&subtype=" . $object_subtype . "&object_type=". urlencode($ot) ."&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));
+
+}
+
+$body = '';
+if (!empty($tag)) {
+
+ // blank the results to start off
+ $results = new stdClass();
+ $results->entities = array();
+ $results->total = 0;
+
+ $results = trigger_plugin_hook('search:entities', '', array('tag' => $tag,
+ 'offset' => $offset,
+ 'limit' => $limit,
+ 'searchtype' => $searchtype,
+ 'object_type' => $object_type,
+ 'subtype' => $subtype,
+ 'tagtype' => $tagtype,
+ 'owner_guid' => $owner_guid_array
+ ),
+ $results);
+
+ /*
+ $searchtypes = trigger_plugin_hook('search:types', '', NULL, array());
+ add_submenu_item(elgg_echo('search:type:all'),
+ $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&searchtype=all");
+
+ foreach ($searchtypes as $st) {
+ add_submenu_item(elgg_echo('search:type:' . $st),
+ $CONFIG->wwwroot . "pg/search/?tag=". urlencode($tag) ."&searchtype=" . $st);
+ }
+ */
+
+
+ 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);
+ }
+
+
+
+
+ //print_r($results);
+
+ $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag));
+ $body .= elgg_view('search/startblurb',array('tag' => $tag));
+
+
+ $body .= elgg_view('search/entity_list',array('entities' => $results->entities,
+ 'count' => $results->total,
+ 'offset' => $offset,
+ 'limit' => $limit,
+ 'baseurl' => $_SERVER['REQUEST_URI'],
+ 'fullview' => false,
+ 'context' => 'search',
+ 'viewtypetoggle' => true,
+ 'viewtype' => $viewtype,
+ 'pagination' => true
+ ));
+
+
+
+
+elgg_view_entity_list($results->entities, count($results->entities), 0, count($results->entities), false);
+} else {
+
+ $body .= elgg_view_title(elgg_echo('search:enterterm'));
+ $body .= elgg_view('page_elements/contentwrapper', array('body' => '<div>' . elgg_view('page_elements/searchbox') . '</div>'));
+
+
+}
+$layout = elgg_view_layout('two_column_left_sidebar','',$body);
+
+
+page_draw($title, $layout);
+
+
+?> \ No newline at end of file
diff --git a/mod/search/languages/en.php b/mod/search/languages/en.php
new file mode 100644
index 000000000..17796860f
--- /dev/null
+++ b/mod/search/languages/en.php
@@ -0,0 +1,8 @@
+<?php
+
+ $language_array = array('search:enterterm' => 'Enter a search term:'
+ );
+
+add_translation('en', $language_array);
+
+?>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
new file mode 100644
index 000000000..1f8415445
--- /dev/null
+++ b/mod/search/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+ <field key="author" value="Curverider Ltd, The MITRE Corporation" />
+ <field key="version" value="1.7" />
+ <field key="description" value="Allow search across entities of the site" />
+ <field key="website" value="http://www.elgg.org/" />
+ <field key="copyright" value="(C) Curverider 2008-2009, MITRE 2009" />
+ <field key="licence" value="GNU Public License version 2" />
+ <field key="elgg_version" value="2009030702" />
+</plugin_manifest> \ No newline at end of file
diff --git a/mod/search/start.php b/mod/search/start.php
new file mode 100644
index 000000000..a434fc2b5
--- /dev/null
+++ b/mod/search/start.php
@@ -0,0 +1,117 @@
+<?php
+
+ /**
+ * Elgg core search.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd <info@elgg.com>
+ * @link http://elgg.org/
+ */
+
+ /**
+ * Initialise search helper functions.
+ *
+ */
+ function search_init() {
+ global $CONFIG;
+
+ // page handler for search actions and results
+ register_page_handler('search','search_page_handler');
+
+ // hook into the search callback to use the metadata system (this is the part that will go away!)
+ register_plugin_hook('search:entities', 'all', 'search_original_hook');
+
+ // list of available search types should include our base parts
+ register_plugin_hook('searchtypes', 'all', 'search_base_search_types_hook');
+
+ // add in CSS for search elements
+ extend_view('css', 'search/css');
+ }
+
+ /**
+ * Page handler for search
+ *
+ * @param array $page Page elements from pain page handler
+ */
+ function search_page_handler($page) {
+ global $CONFIG;
+
+ if(!get_input('tag')) {
+ set_input('tag', $page[0]);
+ }
+
+ include_once($CONFIG->path . "mod/search/index.php");
+ }
+
+ /**
+ * Core search hook.
+ * Returns an object with two parts:
+ * ->entities: an array of instantiated entities that have been decorated with
+ * volatile "search" data indicating what they matched. These are
+ * the entities to be displayed to the user on this page.
+ * ->total: total number of entities overall. This function can update this
+ * limit to ask for more pages in the pagination.
+ */
+ function search_original_hook($hook, $type, $returnvalue, $params) {
+ $tag = $params['tag'];
+ $offset = $params['offset']; // starting page
+ $limit = $params['limit']; // number per page
+ $searchtype = $params['searchtype']; // the search type we're looking for
+ $object_type = $params['object_type'];
+ $subtype = $params['subtype'];
+ $owner_guid = $params['owner_guid'];
+ $tagtype = $params['tagtype'];
+
+ $count = get_entities_from_metadata($tagtype, elgg_strtolower($tag), $object_type, $subtype, $owner_guid, $limit, $offset, "", 0, true);
+ $ents = get_entities_from_metadata($tagtype, elgg_strtolower($tag), $object_type, $subtype, $owner_guid, $limit, $offset, "", 0, false);
+
+
+ /*
+ * Foreach entity
+ * get the metadata keys
+ * If the value matches, hang onto the key
+ * add all the matched keys to VolatileData
+ * This tells us *why* each entity matched
+ */
+ foreach ($ents as $ent) {
+ $metadata = get_metadata_for_entity($ent->getGUID());
+ $matched = array();
+ if ($metadata) {
+ foreach ($metadata as $tuple) {
+ if ($tag === $tuple->value) {
+ // This is one of the matching elements
+ $matched[] = $tuple->name;
+ }
+ }
+ $ent->setVolatileData("search", $matched);
+ }
+ }
+
+ // merge in our entities with any coming in from elsewhere
+ $returnvalue->entities = array_merge($returnvalue->entities, $ents);
+
+ // expand the total entity count if necessary
+ if ($count > $returnvalue->total) {
+ $returnvalue->total = $count;
+ }
+
+ return $returnvalue;
+ }
+
+ /**
+ * return our base search types
+ */
+ function search_base_search_types_hook($hook, $type, $returnvalue, $params) {
+ if (!is_array($returnvalue)) {
+ $returnvalue = array();
+ }
+
+ return $returnvalue;
+ }
+
+ /** Register init system event **/
+
+ register_elgg_event_handler('init','system','search_init');
+
+?>
diff --git a/mod/search/views/default/page_elements/searchbox.php b/mod/search/views/default/page_elements/searchbox.php
new file mode 100644
index 000000000..4bab36be9
--- /dev/null
+++ b/mod/search/views/default/page_elements/searchbox.php
@@ -0,0 +1,4 @@
+<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+ <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onclick="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' }" class="search_input" />
+ <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
+</form>
diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php
new file mode 100644
index 000000000..08c681f63
--- /dev/null
+++ b/mod/search/views/default/search/css.php
@@ -0,0 +1,61 @@
+.searchtype {
+background: #FFFACD;
+color: black;
+}
+
+.searchtypes {
+border: 1px #EEEEEE solid;
+padding: 4px;
+margin: 6px;
+}
+
+#searchform input.search_input {
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ background-color:#FFFFFF;
+ border:1px solid #BBBBBB;
+ color:#999999;
+ font-size:12px;
+ font-weight:bold;
+ margin:0pt;
+ padding:2px;
+ width:180px;
+ height:12px;
+}
+#searchform input.search_submit_button {
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ color:#333333;
+ background: #cccccc;
+ border:none;
+ font-size:12px;
+ font-weight:bold;
+ margin:0px;
+ padding:2px;
+ width:auto;
+ height:18px;
+ cursor:pointer;
+}
+#searchform input.search_submit_button:hover {
+ color:#ffffff;
+ background: #4690d6;
+}
+
+
+.search_listing {
+ display: block;
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ background:white;
+ margin:0 10px 5px 10px;
+ padding:5px;
+}
+
+/* override the entity container piece */
+.search_listing .entity_listing {
+ -webkit-border-radius: 0px;
+ -moz-border-radius: 0px;
+ background: transparent;
+ margin: 0;
+ padding: 0;
+} \ No newline at end of file
diff --git a/views/default/search/entity_list.php b/mod/search/views/default/search/entity_list.php
index f0438fa11..56291ba3a 100644
--- a/views/default/search/entity_list.php
+++ b/mod/search/views/default/search/entity_list.php
@@ -1,62 +1,66 @@
-<?php
-
- $context = $vars['context'];
- $offset = $vars['offset'];
- $entities = $vars['entities'];
- $limit = $vars['limit'];
- $count = $vars['count'];
- $baseurl = $vars['baseurl'];
- $context = $vars['context'];
- $viewtype = $vars['viewtype'];
- $pagination = $vars['pagination'];
- $fullview = $vars['fullview'];
-
- $html = "";
- $nav = "";
-
- if (isset($vars['viewtypetoggle'])) {
- $viewtypetoggle = $vars['viewtypetoggle'];
- } else {
- $viewtypetoggle = true;
- }
-
- if ($context == "search" && $count > 0 && $viewtypetoggle) {
- $nav .= elgg_view("navigation/viewtype",array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'viewtype' => $viewtype,
-
- ));
- }
-
- if ($pagination)
- $nav .= elgg_view('navigation/pagination',array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'limit' => $limit,
-
- ));
-
- $html .= $nav;
-
- if ($viewtype == "list") {
- if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- $html .= elgg_view_entity($entity, $fullview);
- }
- }
- } else {
- if (is_array($entities) && sizeof($entities) > 0)
- $html .= elgg_view("search/gallery",array('entities' => $entities));
- }
-
- if ($count)
- $html .= $nav;
-
- echo $html;
-
-?>
+<?php
+ $context = $vars['context'];
+ $offset = $vars['offset'];
+ $entities = $vars['entities'];
+ $limit = $vars['limit'];
+ $count = $vars['count'];
+ $baseurl = $vars['baseurl'];
+ $context = $vars['context'];
+ $viewtype = $vars['viewtype'];
+ $pagination = $vars['pagination'];
+ $fullview = $vars['fullview'];
+
+ $html = "";
+ $nav = "";
+
+ if (isset($vars['viewtypetoggle'])) {
+ $viewtypetoggle = $vars['viewtypetoggle'];
+ } else {
+ $viewtypetoggle = true;
+ }
+
+ if ($context == "search" && $count > 0 && $viewtypetoggle) {
+ $nav .= elgg_view("navigation/viewtype",array(
+
+ 'baseurl' => $baseurl,
+ 'offset' => $offset,
+ 'count' => $count,
+ 'viewtype' => $viewtype,
+
+ ));
+ }
+
+ if ($pagination)
+ $nav .= elgg_view('navigation/pagination',array(
+
+ 'baseurl' => $baseurl,
+ 'offset' => $offset,
+ 'count' => $count,
+ 'limit' => $limit,
+
+ ));
+
+ $html .= $nav;
+
+ if ($viewtype == "list") {
+ if (is_array($entities) && sizeof($entities) > 0) {
+ foreach($entities as $entity) {
+ $ev = elgg_view_entity($entity, $fullview);
+
+ $html .= elgg_view('search/listing', array('entity_view' => $ev,
+ 'search_types' => $entity->getVolatileData('search')));
+
+ }
+ }
+ } else if ($viewtype == "gallery") {
+ if (is_array($entities) && sizeof($entities) > 0) {
+ $html .= elgg_view("search/gallery",array('entities' => $entities));
+ }
+ }
+
+ if ($count)
+ $html .= $nav;
+
+ echo $html;
+
+?>
diff --git a/views/default/search/gallery.php b/mod/search/views/default/search/gallery.php
index 366cd713b..753a38684 100644
--- a/views/default/search/gallery.php
+++ b/mod/search/views/default/search/gallery.php
@@ -1,49 +1,55 @@
-<?php
-
- /**
- * Elgg gallery view
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
- $entities = $vars['entities'];
- if (is_array($entities) && sizeof($entities) > 0) {
-
-?>
-
- <table class="search_gallery">
-
-<?php
-
- $col = 0;
- foreach($entities as $entity) {
- if ($col == 0) {
-
- echo "<tr>";
-
- }
- echo "<td class=\"search_gallery_item\">";
- echo elgg_view_entity($entity);
- echo "</td>";
- $col++;
- if ($col > 3) {
- echo "</tr>";
- $col = 0;
- }
- }
- if ($col > 0) echo "</tr>";
-
-?>
-
- </table>
-
-<?php
-
- }
-
+<?php
+
+ /**
+ * Elgg gallery view
+ *
+ * @package Elgg
+ * @subpackage Core
+
+ * @author Curverider Ltd
+
+ * @link http://elgg.org/
+ */
+
+ $entities = $vars['entities'];
+ if (is_array($entities) && sizeof($entities) > 0) {
+
+?>
+
+ <table class="entity_gallery">
+
+<?php
+
+ $col = 0;
+ foreach($entities as $entity) {
+ if ($col == 0) {
+
+ echo "<tr>";
+
+ }
+ echo "<td class=\"entity_gallery_item\">";
+
+ $ev = elgg_view_entity($entity, $fullview);
+
+ echo elgg_view('search/listing', array('entity_view' => $ev,
+ 'search_types' => $entity->getVolatileData('search')));
+
+
+ echo "</td>";
+ $col++;
+ if ($col > 3) {
+ echo "</tr>";
+ $col = 0;
+ }
+ }
+ if ($col > 0) echo "</tr>";
+
+?>
+
+ </table>
+
+<?php
+
+ }
+
?> \ No newline at end of file
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
new file mode 100644
index 000000000..f27116a9f
--- /dev/null
+++ b/mod/search/views/default/search/listing.php
@@ -0,0 +1,35 @@
+<?php
+
+ /**
+ * Elgg search listing
+ *
+ * @package Elgg
+ * @subpackage Core
+
+ * @author Curverider Ltd
+
+ * @link http://elgg.org/
+ */
+
+?>
+
+ <div class="search_listing">
+
+<?php
+
+ echo $vars['entity_view'];
+
+ if ($vars['search_types'] && is_array($vars['search_types'])) {
+ echo '<div class="searchtypes">Matched: ';
+ foreach ($vars['search_types'] as $st) {
+ echo '<span class="searchtype">' . elgg_echo($st) . '</span> ';
+ }
+ echo '</div>';
+
+ }
+
+
+
+
+?>
+ </div>
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 46314f2ad..2908cbd95 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -68,10 +68,7 @@
</div>
<div id="elgg_topbar_container_search">
-<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
- <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onclick="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' }" class="search_input" />
- <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
-</form>
+<?php echo elgg_view('page_elements/searchbox'); ?>
</div>
</div><!-- /#elgg_topbar -->
@@ -80,4 +77,4 @@
<?php
}
-?> \ No newline at end of file
+?>
diff --git a/views/default/search/gallery_listing.php b/views/default/search/gallery_listing.php
deleted file mode 100644
index 4c0f40643..000000000
--- a/views/default/search/gallery_listing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
- /**
- * Elgg search listing: gallery view
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
-?>
-
- <div class="search_listing">
-
- <div class="search_listing_header">
-
- <?php
-
- echo $vars['icon'];
-
- ?>
-
- </div>
- <div class="search_listing_info">
- <?php
-
- echo $vars['info'];
-
- ?>
- </div>
-
- </div> \ No newline at end of file
diff --git a/views/default/search/listing.php b/views/default/search/listing.php
deleted file mode 100644
index 0a9d01fee..000000000
--- a/views/default/search/listing.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
- /**
- * Elgg search listing
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
- if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {
-
- echo elgg_view("search/gallery_listing",$vars);
-
- } else {
-
-?>
-
- <div class="search_listing">
-
- <div class="search_listing_icon">
- <?php
-
- echo $vars['icon'];
-
- ?>
- </div>
- <div class="search_listing_info">
- <?php
-
- echo $vars['info'];
-
- ?>
- </div>
-
- </div>
-
-<?php
-
- }
-
-?> \ No newline at end of file
diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php
deleted file mode 100644
index 82b4aef8c..000000000
--- a/views/default/search/startblurb.php
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
-
- ?>
-</div> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 21:18:35 +0000