$context = get_context();
- $html = elgg_view('entities/entity_list',array(
+ $html = elgg_view('search/entity_list',array(
'entities' => $entities,
'count' => $count,
'offset' => $offset,
* @return string The HTML (etc) representing the listing
*/
function elgg_view_listing($icon, $info) {
- return elgg_view('entities/entity_listing',array('icon' => $icon, 'info' => $info));
+ return elgg_view('search/listing',array('icon' => $icon, 'info' => $info));
}
/**
*/
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.
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'] = "";
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.
*
{
// 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;
--- /dev/null
+<?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');
+?>
+++ /dev/null
---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;
-
+++ /dev/null
-<?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
+++ /dev/null
-<?php
-
- $language_array = array('search:enterterm' => 'Enter a search term:'
- );
-
-add_translation('en', $language_array);
-
-?>
+++ /dev/null
-<?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
+++ /dev/null
-<?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');
-
-?>
+++ /dev/null
-<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>
+++ /dev/null
-.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
+++ /dev/null
-<?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>
</div>
<div id="elgg_topbar_container_search">
-<?php echo elgg_view('page_elements/searchbox'); ?>
+<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>
</div>
</div><!-- /#elgg_topbar -->
<?php
}
-?>
+?>
\ No newline at end of file
-<?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;
-
-?>
+<?php\r
+\r
+ $context = $vars['context'];\r
+ $offset = $vars['offset'];\r
+ $entities = $vars['entities'];\r
+ $limit = $vars['limit'];\r
+ $count = $vars['count'];\r
+ $baseurl = $vars['baseurl'];\r
+ $context = $vars['context'];\r
+ $viewtype = $vars['viewtype'];\r
+ $pagination = $vars['pagination'];\r
+ $fullview = $vars['fullview']; \r
+ \r
+ $html = "";\r
+ $nav = "";\r
+ \r
+ if (isset($vars['viewtypetoggle'])) {\r
+ $viewtypetoggle = $vars['viewtypetoggle'];\r
+ } else {\r
+ $viewtypetoggle = true;\r
+ }\r
+\r
+ if ($context == "search" && $count > 0 && $viewtypetoggle) {\r
+ $nav .= elgg_view("navigation/viewtype",array(\r
+ \r
+ 'baseurl' => $baseurl,\r
+ 'offset' => $offset,\r
+ 'count' => $count,\r
+ 'viewtype' => $viewtype,\r
+ \r
+ ));\r
+ }\r
+ \r
+ if ($pagination)\r
+ $nav .= elgg_view('navigation/pagination',array(\r
+ \r
+ 'baseurl' => $baseurl,\r
+ 'offset' => $offset,\r
+ 'count' => $count,\r
+ 'limit' => $limit,\r
+ \r
+ ));\r
+ \r
+ $html .= $nav;\r
+\r
+ if ($viewtype == "list") {\r
+ if (is_array($entities) && sizeof($entities) > 0) {\r
+ foreach($entities as $entity) {\r
+ $html .= elgg_view_entity($entity, $fullview);\r
+ }\r
+ }\r
+ } else {\r
+ if (is_array($entities) && sizeof($entities) > 0)\r
+ $html .= elgg_view("search/gallery",array('entities' => $entities));\r
+ }\r
+ \r
+ if ($count)\r
+ $html .= $nav;\r
+ \r
+ echo $html;\r
+\r
+?>\r
-<?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
-
- }
-
+<?php\r
+\r
+ /**\r
+ * Elgg gallery view\r
+ * \r
+ * @package Elgg\r
+ * @subpackage Core\r
+
+ * @author Curverider Ltd\r
+
+ * @link http://elgg.org/\r
+ */\r
+\r
+ $entities = $vars['entities'];\r
+ if (is_array($entities) && sizeof($entities) > 0) {\r
+ \r
+?>\r
+\r
+ <table class="search_gallery">\r
+\r
+<?php\r
+ \r
+ $col = 0;\r
+ foreach($entities as $entity) {\r
+ if ($col == 0) {\r
+ \r
+ echo "<tr>";\r
+ \r
+ }\r
+ echo "<td class=\"search_gallery_item\">";\r
+ echo elgg_view_entity($entity);\r
+ echo "</td>";\r
+ $col++;\r
+ if ($col > 3) {\r
+ echo "</tr>";\r
+ $col = 0;\r
+ } \r
+ }\r
+ if ($col > 0) echo "</tr>";\r
+ \r
+?>\r
+\r
+ </table>\r
+\r
+<?php\r
+ \r
+ }\r
+ \r
?>
\ No newline at end of file
--- /dev/null
+<?php\r
+\r
+ /**\r
+ * Elgg search listing: gallery view\r
+ * \r
+ * @package Elgg\r
+ * @subpackage Core\r
+
+ * @author Curverider Ltd\r
+
+ * @link http://elgg.org/\r
+ */\r
+\r
+?>\r
+\r
+ <div class="search_listing">\r
+ \r
+ <div class="search_listing_header">\r
+ \r
+ <?php\r
+ \r
+ echo $vars['icon'];\r
+ \r
+ ?>\r
+ \r
+ </div>\r
+ <div class="search_listing_info">\r
+ <?php\r
+\r
+ echo $vars['info'];\r
+ \r
+ ?>\r
+ </div> \r
+ \r
+ </div>
\ No newline at end of file
--- /dev/null
+<?php\r
+\r
+ /**\r
+ * Elgg search listing\r
+ * \r
+ * @package Elgg\r
+ * @subpackage Core\r
+
+ * @author Curverider Ltd\r
+
+ * @link http://elgg.org/\r
+ */\r
+\r
+ if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {\r
+ \r
+ echo elgg_view("search/gallery_listing",$vars);\r
+ \r
+ } else {\r
+\r
+?>\r
+\r
+ <div class="search_listing">\r
+ \r
+ <div class="search_listing_icon">\r
+ <?php\r
+\r
+ echo $vars['icon'];\r
+ \r
+ ?>\r
+ </div>\r
+ <div class="search_listing_info">\r
+ <?php\r
+\r
+ echo $vars['info'];\r
+ \r
+ ?>\r
+ </div> \r
+ \r
+ </div>\r
+ \r
+<?php\r
+\r
+ }\r
+\r
+?>
\ No newline at end of file
--- /dev/null
+\r
+<div class="contentWrapper">\r
+ <?php \r
+ \r
+ echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']); \r
+ \r
+ ?>\r
+</div>
\ No newline at end of file
projects / lorea / elgg.git / commitdiff