$options['order_by'] = $order_by;
}
- if ($limit) {
- $options['limit'] = $limit;
- }
+ // need to pass 0 for all option
+ $options['limit'] = $limit;
if ($offset) {
$options['offset'] = $offset;
/**
* Filter tags from a given string based on registered hooks.
- * @param $var
- * @return mixed The filtered result
+ *
+ * @param mixed $var Anything that does not include an object (strings, ints, arrays)
+ * This includes multi-dimensional arrays.
+ * @return mixed The filtered result - everything will be strings
*/
function filter_tags($var) {
return trigger_plugin_hook('validate', 'input', null, $var);
`language` varchar(6) NOT NULL DEFAULT '',
`code` varchar(32) NOT NULL DEFAULT '',
`banned` enum('yes','no') NOT NULL DEFAULT 'no',
+ `admin` enum('yes','no') NOT NULL DEFAULT 'no',
`last_action` int(11) NOT NULL DEFAULT '0',
`prev_last_action` int(11) NOT NULL DEFAULT '0',
`last_login` int(11) NOT NULL DEFAULT '0',
KEY `code` (`code`),
KEY `last_action` (`last_action`),
KEY `last_login` (`last_login`),
+ KEY `admin` (`admin`),
FULLTEXT KEY `name` (`name`),
FULLTEXT KEY `name_2` (`name`,`username`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
$return = "";
$return = htmLawed($var, $htmlawed_config);
} else {
- $return = array();
+
+ array_walk_recursive($var, 'htmLawedArray', $htmlawed_config);
- foreach($var as $key => $el) {
- $return[$key] = htmLawed($el, $htmlawed_config);
- }
+ $return = $var;
}
}
return $return;
}
+/**
+ * wrapper function for htmlawed for handling arrays
+ */
+function htmLawedArray(&$v, $k, $htmlawed_config) {
+ $v = htmLawed($v, $htmlawed_config);
+}
+
+
register_elgg_event_handler('init', 'system', 'htmlawed_init');
width:180px;
overflow: hidden;
}
+.messages_to {
+ float: left;
+ margin-right: 10px;
+}
+
+/* view and reply to message view */
+.message_body {
+ margin-left: 120px;
+}
.message_subject {
float:left;
width:513px;
if (!isset($users[$letter])) {
$users[$letter] = array();
}
- $users[$letter][$user->name] = $user;
-
+ $users[$letter][$user->guid] = $user;
}
}
$accesslevel = array();
}
+/**
+ * wrapper for recursive array walk decoding
+ */
+function profile_array_decoder(&$v) {
+ $v = html_entity_decode($v, ENT_COMPAT, 'UTF-8');
+}
+
+
foreach($CONFIG->profile as $shortname => $valuetype) {
// the decoding is a stop gag to prevent && showing up in profile fields
// because it is escaped on both input (get_input()) and output (view:output/text). see #561 and #1405.
// must decode in utf8 or string corruption occurs. see #1567.
$value = get_input($shortname);
if (is_array($value)) {
- foreach ($value as $k => $v) {
- $value[$k] = html_entity_decode($v, ENT_COMPAT, 'UTF-8');
- }
+ array_walk_recursive($value, 'profile_array_decoder');
} else {
$value = html_entity_decode($value, ENT_COMPAT, 'UTF-8');
}
system_message(elgg_echo("profile:saved"));
}
-forward($profile_owner->getUrl());
\ No newline at end of file
+forward($profile_owner->getUrl());
'search_types:comments' => 'Comments',
'search:comment_on' => 'Comment on "%s"',
+ 'search:comment_by' => 'by',
'search:unavailable_entity' => 'Unavailable Entity',
);
$tags_str = implode('. ', $matched_tags_strs);
$tags_str = search_get_highlighted_relevant_substrings($tags_str, $params['query']);
- $tags_str = "($tags_str)";
+ //$tags_str = "($tags_str)";
$entity->setVolatileData('search_matched_title', $title_str);
$entity->setVolatileData('search_matched_description', $desc_str);
.searchMatchColor5 {
background-color: #4690d6;
}
+
+/* formatting for the search results */
+.search_listing .item_extra {
+ border: 1px solid #cccccc;
+ margin: 2px;
+ padding: 3px;
+}
+
+.search_listing .item_timestamp {
+ font-style: italic;
+}
\ No newline at end of file
/**
* Elgg search entity
*
+ * Display largely controlled by a set of overrideable volatile data:
+ * - search_icon (defaults to entity icon)
+ * - search_matched_title
+ * - search_matched_description
+ * - search_matched_extra
+ * - search_url (defaults to entity->getURL())
+ * - search_time (defaults to entity->time_updated or entity->time_created)
+ *
* @package Elgg
* @subpackage Core
* @author Curverider Ltd
$entity = $vars['entity'];
-// display the entity's owner by default if available.
-// @todo allow an option to switch to displaying the entity's icon instead.
-$type = $entity->getType();
-if ($type == 'user' || $type == 'group') {
- $icon = elgg_view('profile/icon', array('entity' => $entity, 'size' => 'tiny'));
-} elseif ($owner = $entity->getOwnerEntity()) {
- $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
-} else {
- // display a generic icon if no owner, though there will probably be
- // other problems if the owner can't be found.
- $icon = elgg_view(
- 'graphics/icon', array(
- 'entity' => $entity,
- 'size' => 'tiny',
- ));
+$icon = $entity->getVolatileData('search_icon');
+if (!$icon) {
+ // display the entity's owner by default if available.
+ // @todo allow an option to switch to displaying the entity's icon instead.
+ $type = $entity->getType();
+ if ($type == 'user' || $type == 'group') {
+ $icon = elgg_view('profile/icon', array('entity' => $entity, 'size' => 'small'));
+ } elseif ($owner = $entity->getOwnerEntity()) {
+ $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'small'));
+ } else {
+ // display a generic icon if no owner, though there will probably be
+ // other problems if the owner can't be found.
+ $icon = elgg_view(
+ 'graphics/icon', array(
+ 'entity' => $entity,
+ 'size' => 'small',
+ ));
+ }
}
$title = $entity->getVolatileData('search_matched_title');
$description = $entity->getVolatileData('search_matched_description');
$extra_info = $entity->getVolatileData('search_matched_extra');
-$url = $entity->getURL();
-
-if (!$title) {
- $title = elgg_echo('untitled');
+$url = $entity->getVolatileData('search_url');
+if (!$url) {
+ $url = $entity->getURL();
}
-
$title = "<a href=\"$url\">$title</a>";
-$tc = $entity->time_created;
-$tu = $entity->time_updated;
-$time = friendly_time(($tu > $tc) ? $tu : $tc);
-
-echo <<<___END
+$time = $entity->getVolatileData('search_time');
+if (!$time) {
+ $tc = $entity->time_created;
+ $tu = $entity->time_updated;
+ $time = friendly_time(($tu > $tc) ? $tu : $tc);
+}
+?>
<div class="search_listing clearfloat">
- <div class="search_listing_icon">$icon</div>
+ <div class="search_listing_icon"><?php echo $icon; ?></div>
<div class="search_listing_info">
- <p class="entity_title">$title</p>$description
- <p class="entity_subtext">$time $extra_info</p>
+ <p class="item_title"><?php echo $title; ?></p>
+ <p class="item_description"><?php echo $description; ?></p>
+<?php
+if ($extra_info) {
+?>
+ <p class="item_extra"><?php echo $extra_info; ?></p>
+<?php
+}
+?>
+ <p class="item_timestamp"><?php echo $time; ?></p>
</div>
</div>
-___END;
-
-// php bug. must have close tag after heredocs
-?>
\ No newline at end of file
--- /dev/null
+<?php
+/**
+ * Elgg search comment view
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+$entity = $vars['entity'];
+
+$author_name = '';
+$comment_author_guid = $entity->getVolatileData('search_matched_comment_owner_guid');
+$author = get_user($comment_author_guid);
+if ($author) {
+ $author_name = $author->name;
+}
+
+// @todo Sometimes we find comments on entities we can't display...
+if ($entity->getVolatileData('search_unavailable_entity')) {
+ $title = sprintf(elgg_echo('search:comment_on'), elgg_echo('search:unavailable_entity'));
+} else {
+ if ($entity->getType() == 'object') {
+ $title = $entity->title;
+ } else {
+ $title = $entity->name;
+ }
+
+ if (!$title) {
+ $title = elgg_echo('item:' . $entity->getType() . ':' . $entity->getSubtype());
+ }
+
+ if (!$title) {
+ $title = elgg_echo('item:' . $entity->getType());
+ }
+
+ $title = sprintf(elgg_echo('search:comment_on'), $title);
+ $title .= ' ' . elgg_echo('search:comment_by') . ' ' . $author_name;
+ $url = $entity->getURL() . '#annotation-' . $entity->getVolatileData('search_match_annotation_id');
+}
+
+$description = $entity->getVolatileData('search_matched_comment');
+$tc = $entity->getVolatileData('search_matched_comment_time_created');;
+
+?>
+
+<item>
+ <guid isPermaLink='true'><?php echo htmlspecialchars($url); ?></guid>
+ <pubDate><?php echo date("r", $tc) ?></pubDate>
+ <link><?php echo htmlspecialchars($url); ?></link>
+ <title><![CDATA[<?php echo $title; ?>]]></title>
+ <description><![CDATA[<?php echo $description; ?>]]></description>
+</item>
$name = get_input('n');
$admin_option = false;
-if (($_SESSION['user']->isAdmin()) && ($vars['show_admin'])) {
+$loggedin_user = get_loggedin_user();
+
+if ($loggedin_user && $loggedin_user->isAdmin() && isset($vars['show_admin'])) {
$admin_option = true;
}
</div>
<script type="text/javascript">
$(document).ready(function() { $('input[name=name]').focus(); });
-</script>
\ No newline at end of file
+</script>
if (!isset($users[$letter])) {
$users[$letter] = array();
}
- $users[$letter][$user->name] = $user;
+ $users[$letter][$user->guid] = $user;
}
}
$title = $vars['title'];
-
-$title = trim($title);
-$title = strtolower($title);
+
+//$title = iconv('UTF-8', 'ASCII//TRANSLIT', $title);
$title = preg_replace("/[^\w ]/","",$title);
$title = str_replace(" ","-",$title);
$title = str_replace("--","-",$title);
+$title = trim($title);
+$title = strtolower($title);
echo $title;
projects / lorea / elgg.git / commitdiff