Elgg / Elgg

views/default/output/tag.php

Indentation +5 added lines, -5 removed lines

@@ -10,17 +10,17 @@
 
 $value = elgg_extract('value', $vars);
 if (empty($value) && $value !== 0 && $value !== '0') {
-	return;
+    return;
 }
 
 $href = elgg_extract('href', $vars);
 $vars['rel'] = 'tag';
 
 if ($href) {
-	$vars['text'] = $value;
-	$vars['encode_text'] = true;
+    $vars['text'] = $value;
+    $vars['encode_text'] = true;
 	
-	echo elgg_view('output/url', $vars);
+    echo elgg_view('output/url', $vars);
 } else {
-	echo elgg_view('output/text', $vars);
+    echo elgg_view('output/text', $vars);
 }

mod/search/start.php

Indentation +336 added lines, -336 removed lines

@@ -10,30 +10,30 @@ 
  * Initialize search plugin
  */
 function search_init() {
-	require_once 'search_hooks.php';
+    require_once 'search_hooks.php';
 
-	// page handler for search actions and results
-	elgg_register_page_handler('search', 'search_page_handler');
+    // page handler for search actions and results
+    elgg_register_page_handler('search', 'search_page_handler');
 
-	// register some default search hooks
-	elgg_register_plugin_hook_handler('search', 'object', 'search_objects_hook');
-	elgg_register_plugin_hook_handler('search', 'user', 'search_users_hook');
-	elgg_register_plugin_hook_handler('search', 'group', 'search_groups_hook');
+    // register some default search hooks
+    elgg_register_plugin_hook_handler('search', 'object', 'search_objects_hook');
+    elgg_register_plugin_hook_handler('search', 'user', 'search_users_hook');
+    elgg_register_plugin_hook_handler('search', 'group', 'search_groups_hook');
 
-	// tags and comments are a bit different.
-	// register a search types and a hooks for them.
-	elgg_register_plugin_hook_handler('search_types', 'get_types', 'search_custom_types_tags_hook');
-	elgg_register_plugin_hook_handler('search', 'tags', 'search_tags_hook');
+    // tags and comments are a bit different.
+    // register a search types and a hooks for them.
+    elgg_register_plugin_hook_handler('search_types', 'get_types', 'search_custom_types_tags_hook');
+    elgg_register_plugin_hook_handler('search', 'tags', 'search_tags_hook');
 
-	// add in CSS for search elements
-	elgg_extend_view('elgg.css', 'search/css');
+    // add in CSS for search elements
+    elgg_extend_view('elgg.css', 'search/css');
 
-	// extend view for elgg topbar search box
-	elgg_extend_view('page/elements/sidebar', 'search/header', 0);
+    // extend view for elgg topbar search box
+    elgg_extend_view('page/elements/sidebar', 'search/header', 0);
 
-	elgg_register_plugin_hook_handler('robots.txt', 'site', 'search_exclude_robots');
+    elgg_register_plugin_hook_handler('robots.txt', 'site', 'search_exclude_robots');
 	
-	elgg_register_plugin_hook_handler('view_vars', 'output/tag', 'search_output_tag');
+    elgg_register_plugin_hook_handler('view_vars', 'output/tag', 'search_output_tag');
 }
 
 /**
@@ -44,17 +44,17 @@ 
  */
 function search_page_handler($page) {
 
-	// if there is no q set, we're being called from a legacy installation
-	// it expects a search by tags.
-	// actually it doesn't, but maybe it should.
-	// maintain backward compatibility
-	if (!get_input('q', get_input('tag', null))) {
-		set_input('q', $page[0]);
-		//set_input('search_type', 'tags');
-	}
-
-	echo elgg_view_resource('search/index');
-	return true;
+    // if there is no q set, we're being called from a legacy installation
+    // it expects a search by tags.
+    // actually it doesn't, but maybe it should.
+    // maintain backward compatibility
+    if (!get_input('q', get_input('tag', null))) {
+        set_input('q', $page[0]);
+        //set_input('search_type', 'tags');
+    }
+
+    echo elgg_view_resource('search/index');
+    return true;
 }
 
 /**
@@ -70,116 +70,116 @@ 
  */
 function search_get_highlighted_relevant_substrings($haystack, $query, $min_match_context = 30, $max_length = 300, $tag_match = false) {
 
-	$haystack = strip_tags($haystack);
-	$haystack_length = elgg_strlen($haystack);
-	$haystack_lc = elgg_strtolower($haystack);
-
-	if (!$tag_match) {
-		$words = search_remove_ignored_words($query, 'array');
-	} else {
-		$words = [];
-	}
-
-	// if haystack < $max_length return the entire haystack w/formatting immediately
-	if ($haystack_length <= $max_length) {
-		$return = search_highlight_words($words, $haystack);
-
-		return $return;
-	}
-
-	// get the starting positions and lengths for all matching words
-	$starts = [];
-	$lengths = [];
-	foreach ($words as $word) {
-		$word = elgg_strtolower($word);
-		$count = elgg_substr_count($haystack_lc, $word);
-		$word_len = elgg_strlen($word);
-		$haystack_len = elgg_strlen($haystack_lc);
-
-		// find the start positions for the words
-		if ($count > 1) {
-			$offset = 0;
-			while (false !== $pos = elgg_strpos($haystack_lc, $word, $offset)) {
-				$start = ($pos - $min_match_context > 0) ? $pos - $min_match_context : 0;
-				$starts[] = $start;
-				$stop = $pos + $word_len + $min_match_context;
-				$lengths[] = $stop - $start;
-				$offset += $pos + $word_len;
-
-				if ($offset >= $haystack_len) {
-					break;
-				}
-			}
-		} else {
-			$pos = elgg_strpos($haystack_lc, $word);
-			$start = ($pos - $min_match_context > 0) ? $pos - $min_match_context : 0;
-			$starts[] = $start;
-			$stop = $pos + $word_len + $min_match_context;
-			$lengths[] = $stop - $start;
-		}
-	}
-
-	$offsets = search_consolidate_substrings($starts, $lengths);
-
-	// figure out if we can adjust the offsets and lengths
-	// in order to return more context
-	$total_length = array_sum($offsets);
-
-	$add_length = 0;
-	if ($total_length < $max_length && $offsets) {
-		$add_length = floor((($max_length - $total_length) / count($offsets)) / 2);
-
-		$starts = [];
-		$lengths = [];
-		foreach ($offsets as $offset => $length) {
-			$start = ($offset - $add_length > 0) ? $offset - $add_length : 0;
-			$length = $length + $add_length;
-			$starts[] = $start;
-			$lengths[] = $length;
-		}
-
-		$offsets = search_consolidate_substrings($starts, $lengths);
-	}
-
-	// sort by order of string size descending (which is roughly
-	// the proximity of matched terms) so we can keep the
-	// substrings with terms closest together and discard
-	// the others as needed to fit within $max_length.
-	arsort($offsets);
-
-	$return_strs = [];
-	$total_length = 0;
-	foreach ($offsets as $start => $length) {
-		$string = trim(elgg_substr($haystack, $start, $length));
-
-		// continue past if adding this substring exceeds max length
-		if ($total_length + $length > $max_length) {
-			continue;
-		}
-
-		$total_length += $length;
-		$return_strs[$start] = $string;
-	}
-
-	// put the strings in order of occurence
-	ksort($return_strs);
-
-	// add ...s where needed
-	$return = implode('...', $return_strs);
-	if (!array_key_exists(0, $return_strs)) {
-		$return = "...$return";
-	}
-
-	// add to end of string if last substring doesn't hit the end.
-	$starts = array_keys($return_strs);
-	$last_pos = $starts[count($starts)-1];
-	if ($last_pos + elgg_strlen($return_strs[$last_pos]) < $haystack_length) {
-		$return .= '...';
-	}
-
-	$return = search_highlight_words($words, $return);
-
-	return $return;
+    $haystack = strip_tags($haystack);
+    $haystack_length = elgg_strlen($haystack);
+    $haystack_lc = elgg_strtolower($haystack);
+
+    if (!$tag_match) {
+        $words = search_remove_ignored_words($query, 'array');
+    } else {
+        $words = [];
+    }
+
+    // if haystack < $max_length return the entire haystack w/formatting immediately
+    if ($haystack_length <= $max_length) {
+        $return = search_highlight_words($words, $haystack);
+
+        return $return;
+    }
+
+    // get the starting positions and lengths for all matching words
+    $starts = [];
+    $lengths = [];
+    foreach ($words as $word) {
+        $word = elgg_strtolower($word);
+        $count = elgg_substr_count($haystack_lc, $word);
+        $word_len = elgg_strlen($word);
+        $haystack_len = elgg_strlen($haystack_lc);
+
+        // find the start positions for the words
+        if ($count > 1) {
+            $offset = 0;
+            while (false !== $pos = elgg_strpos($haystack_lc, $word, $offset)) {
+                $start = ($pos - $min_match_context > 0) ? $pos - $min_match_context : 0;
+                $starts[] = $start;
+                $stop = $pos + $word_len + $min_match_context;
+                $lengths[] = $stop - $start;
+                $offset += $pos + $word_len;
+
+                if ($offset >= $haystack_len) {
+                    break;
+                }
+            }
+        } else {
+            $pos = elgg_strpos($haystack_lc, $word);
+            $start = ($pos - $min_match_context > 0) ? $pos - $min_match_context : 0;
+            $starts[] = $start;
+            $stop = $pos + $word_len + $min_match_context;
+            $lengths[] = $stop - $start;
+        }
+    }
+
+    $offsets = search_consolidate_substrings($starts, $lengths);
+
+    // figure out if we can adjust the offsets and lengths
+    // in order to return more context
+    $total_length = array_sum($offsets);
+
+    $add_length = 0;
+    if ($total_length < $max_length && $offsets) {
+        $add_length = floor((($max_length - $total_length) / count($offsets)) / 2);
+
+        $starts = [];
+        $lengths = [];
+        foreach ($offsets as $offset => $length) {
+            $start = ($offset - $add_length > 0) ? $offset - $add_length : 0;
+            $length = $length + $add_length;
+            $starts[] = $start;
+            $lengths[] = $length;
+        }
+
+        $offsets = search_consolidate_substrings($starts, $lengths);
+    }
+
+    // sort by order of string size descending (which is roughly
+    // the proximity of matched terms) so we can keep the
+    // substrings with terms closest together and discard
+    // the others as needed to fit within $max_length.
+    arsort($offsets);
+
+    $return_strs = [];
+    $total_length = 0;
+    foreach ($offsets as $start => $length) {
+        $string = trim(elgg_substr($haystack, $start, $length));
+
+        // continue past if adding this substring exceeds max length
+        if ($total_length + $length > $max_length) {
+            continue;
+        }
+
+        $total_length += $length;
+        $return_strs[$start] = $string;
+    }
+
+    // put the strings in order of occurence
+    ksort($return_strs);
+
+    // add ...s where needed
+    $return = implode('...', $return_strs);
+    if (!array_key_exists(0, $return_strs)) {
+        $return = "...$return";
+    }
+
+    // add to end of string if last substring doesn't hit the end.
+    $starts = array_keys($return_strs);
+    $last_pos = $starts[count($starts)-1];
+    if ($last_pos + elgg_strlen($return_strs[$last_pos]) < $haystack_length) {
+        $return .= '...';
+    }
+
+    $return = search_highlight_words($words, $return);
+
+    return $return;
 }
 
 
@@ -195,42 +195,42 @@ 
  * @return array
  */
 function search_consolidate_substrings($offsets, $lengths) {
-	// sort offsets by occurence
-	asort($offsets, SORT_NUMERIC);
-
-	// reset the indexes maintaining association with the original offsets.
-	$offsets = array_merge($offsets);
-
-	$new_lengths = [];
-	foreach ($offsets as $i => $offset) {
-		$new_lengths[] = $lengths[$i];
-	}
-
-	$lengths = $new_lengths;
-
-	$return = [];
-	$count = count($offsets);
-	for ($i=0; $i<$count; $i++) {
-		$offset = $offsets[$i];
-		$length = $lengths[$i];
-		$end_pos = $offset + $length;
-
-		// find the next entry that doesn't overlap
-		while (array_key_exists($i+1, $offsets) && $end_pos > $offsets[$i+1]) {
-			$i++;
-			if (!array_key_exists($i, $offsets)) {
-				break;
-			}
-			$end_pos = $lengths[$i] + $offsets[$i];
-		}
-
-		$length = $end_pos - $offset;
-
-		// will never have a colliding offset, so can return as a single array
-		$return[$offset] = $length;
-	}
-
-	return $return;
+    // sort offsets by occurence
+    asort($offsets, SORT_NUMERIC);
+
+    // reset the indexes maintaining association with the original offsets.
+    $offsets = array_merge($offsets);
+
+    $new_lengths = [];
+    foreach ($offsets as $i => $offset) {
+        $new_lengths[] = $lengths[$i];
+    }
+
+    $lengths = $new_lengths;
+
+    $return = [];
+    $count = count($offsets);
+    for ($i=0; $i<$count; $i++) {
+        $offset = $offsets[$i];
+        $length = $lengths[$i];
+        $end_pos = $offset + $length;
+
+        // find the next entry that doesn't overlap
+        while (array_key_exists($i+1, $offsets) && $end_pos > $offsets[$i+1]) {
+            $i++;
+            if (!array_key_exists($i, $offsets)) {
+                break;
+            }
+            $end_pos = $lengths[$i] + $offsets[$i];
+        }
+
+        $length = $end_pos - $offset;
+
+        // will never have a colliding offset, so can return as a single array
+        $return[$offset] = $length;
+    }
+
+    return $return;
 }
 
 /**
@@ -241,43 +241,43 @@ 
  * @return string
  */
 function search_highlight_words($words, $string) {
-	$i = 1;
-	$replace_html = [
-		'strong' => rand(10000, 99999),
-		'class' => rand(10000, 99999),
-		'search-highlight' => rand(10000, 99999),
-		'search-highlight-color' => rand(10000, 99999)
-	];
-
-	foreach ($words as $word) {
-		// remove any boolean mode operators
-		$word = preg_replace("/([\-\+~])([\w]+)/i", '$2', $word);
+    $i = 1;
+    $replace_html = [
+        'strong' => rand(10000, 99999),
+        'class' => rand(10000, 99999),
+        'search-highlight' => rand(10000, 99999),
+        'search-highlight-color' => rand(10000, 99999)
+    ];
+
+    foreach ($words as $word) {
+        // remove any boolean mode operators
+        $word = preg_replace("/([\-\+~])([\w]+)/i", '$2', $word);
 		
-		// escape the delimiter and any other regexp special chars
-		$word = preg_quote($word, '/');
+        // escape the delimiter and any other regexp special chars
+        $word = preg_quote($word, '/');
 		
-		$search = "/($word)/i";
-
-		// @todo
-		// must replace with placeholders in case one of the search terms is
-		// in the html string.
-		// later, will replace the placeholders with the actual html.
-		// Yeah this is hacky.  I'm tired.
-		$strong = $replace_html['strong'];
-		$class = $replace_html['class'];
-		$highlight = $replace_html['search-highlight'];
-		$color = $replace_html['search-highlight-color'];
-
-		$replace = "<$strong $class=\"$highlight $color{$i}\">$1</$strong>";
-		$string = preg_replace($search, $replace, $string);
-		$i++;
-	}
-
-	foreach ($replace_html as $replace => $search) {
-		$string = str_replace($search, $replace, $string);
-	}
-
-	return $string;
+        $search = "/($word)/i";
+
+        // @todo
+        // must replace with placeholders in case one of the search terms is
+        // in the html string.
+        // later, will replace the placeholders with the actual html.
+        // Yeah this is hacky.  I'm tired.
+        $strong = $replace_html['strong'];
+        $class = $replace_html['class'];
+        $highlight = $replace_html['search-highlight'];
+        $color = $replace_html['search-highlight-color'];
+
+        $replace = "<$strong $class=\"$highlight $color{$i}\">$1</$strong>";
+        $string = preg_replace($search, $replace, $string);
+        $i++;
+    }
+
+    foreach ($replace_html as $replace => $search) {
+        $string = str_replace($search, $replace, $string);
+    }
+
+    return $string;
 }
 
 /**
@@ -291,18 +291,18 @@ 
  */
 function search_remove_ignored_words($query, $format = 'array') {
 
-	// don't worry about "s or boolean operators
-	//$query = str_replace(array('"', '-', '+', '~'), '', stripslashes(strip_tags($query)));
-	$query = stripslashes(strip_tags($query));
-	$query = trim($query);
+    // don't worry about "s or boolean operators
+    //$query = str_replace(array('"', '-', '+', '~'), '', stripslashes(strip_tags($query)));
+    $query = stripslashes(strip_tags($query));
+    $query = trim($query);
 	
-	$words = preg_split('/\s+/', $query);
+    $words = preg_split('/\s+/', $query);
 
-	if ($format == 'string') {
-		return implode(' ', $words);
-	}
+    if ($format == 'string') {
+        return implode(' ', $words);
+    }
 
-	return $words;
+    return $words;
 }
 
 /**
@@ -315,43 +315,43 @@ 
  * @return string
  */
 function search_get_search_view($params, $view_type) {
-	switch ($view_type) {
-		case 'list':
-		case 'entity':
-		case 'layout':
-			break;
-
-		default:
-			return false;
-	}
-
-	$view_order = [];
-
-	// check if there's a special search list view for this type:subtype
-	if (isset($params['type']) && $params['type'] && isset($params['subtype']) && $params['subtype']) {
-		$view_order[] = "search/{$params['type']}/{$params['subtype']}/$view_type";
-	}
-
-	// also check for the default type
-	if (isset($params['type']) && $params['type']) {
-		$view_order[] = "search/{$params['type']}/$view_type";
-	}
-
-	// check search types
-	if (isset($params['search_type']) && $params['search_type']) {
-		$view_order[] = "search/{$params['search_type']}/$view_type";
-	}
-
-	// finally default to a search list default
-	$view_order[] = "search/$view_type";
-
-	foreach ($view_order as $view) {
-		if (elgg_view_exists($view)) {
-			return $view;
-		}
-	}
-
-	return false;
+    switch ($view_type) {
+        case 'list':
+        case 'entity':
+        case 'layout':
+            break;
+
+        default:
+            return false;
+    }
+
+    $view_order = [];
+
+    // check if there's a special search list view for this type:subtype
+    if (isset($params['type']) && $params['type'] && isset($params['subtype']) && $params['subtype']) {
+        $view_order[] = "search/{$params['type']}/{$params['subtype']}/$view_type";
+    }
+
+    // also check for the default type
+    if (isset($params['type']) && $params['type']) {
+        $view_order[] = "search/{$params['type']}/$view_type";
+    }
+
+    // check search types
+    if (isset($params['search_type']) && $params['search_type']) {
+        $view_order[] = "search/{$params['search_type']}/$view_type";
+    }
+
+    // finally default to a search list default
+    $view_order[] = "search/$view_type";
+
+    foreach ($view_order as $view) {
+        if (elgg_view_exists($view)) {
+            return $view;
+        }
+    }
+
+    return false;
 }
 
 /**
@@ -363,31 +363,31 @@ 
  * @return str
  */
 function search_get_where_sql($table, $fields, $params) {
-	$query = $params['query'];
-
-	// add the table prefix to the fields
-	foreach ($fields as $i => $field) {
-		if ($table) {
-			$fields[$i] = "$table.$field";
-		}
-	}
-
-	$likes = [];
-	$query_parts = explode(' ', $query);
-	foreach ($fields as $field) {
-		$sublikes = [];
-		foreach ($query_parts as $query_part) {
-			$query_part = sanitise_string($query_part);
-			if (strlen($query_part) == 0) {
-				continue;
-			}
-			$sublikes[] = "$field LIKE '%$query_part%'";
-		}
-		$likes[] = '(' . implode(' AND ', $sublikes) . ')';
-	}
-
-	$likes_str = implode(' OR ', $likes);
-	return "($likes_str)";
+    $query = $params['query'];
+
+    // add the table prefix to the fields
+    foreach ($fields as $i => $field) {
+        if ($table) {
+            $fields[$i] = "$table.$field";
+        }
+    }
+
+    $likes = [];
+    $query_parts = explode(' ', $query);
+    foreach ($fields as $field) {
+        $sublikes = [];
+        foreach ($query_parts as $query_part) {
+            $query_part = sanitise_string($query_part);
+            if (strlen($query_part) == 0) {
+                continue;
+            }
+            $sublikes[] = "$field LIKE '%$query_part%'";
+        }
+        $likes[] = '(' . implode(' AND ', $sublikes) . ')';
+    }
+
+    $likes_str = implode(' OR ', $likes);
+    return "($likes_str)";
 }
 
 
@@ -402,43 +402,43 @@ 
  */
 function search_get_order_by_sql($entities_table, $type_table, $sort, $order) {
 
-	$on = null;
-
-	switch ($sort) {
-		default:
-		case 'relevance':
-			// default is relevance descending.
-			// ascending relevancy is silly and complicated.
-			$on = '';
-			break;
-		case 'created':
-			$on = "$entities_table.time_created";
-			break;
-		case 'updated':
-			$on = "$entities_table.time_updated";
-			break;
-		case 'action_on':
-			// @todo not supported yet in core
-			$on = '';
-			break;
-		case 'alpha':
-			// @todo not support yet because both title
-			// and name columns are used for this depending
-			// on the entity, which we don't always know.  >:O
-			break;
-	}
-	$order = strtolower($order);
-	if ($order != 'asc' && $order != 'desc') {
-		$order = 'DESC';
-	}
-
-	if ($on) {
-		$order_by = "$on $order";
-	} else {
-		$order_by = '';
-	}
-
-	return $order_by;
+    $on = null;
+
+    switch ($sort) {
+        default:
+        case 'relevance':
+            // default is relevance descending.
+            // ascending relevancy is silly and complicated.
+            $on = '';
+            break;
+        case 'created':
+            $on = "$entities_table.time_created";
+            break;
+        case 'updated':
+            $on = "$entities_table.time_updated";
+            break;
+        case 'action_on':
+            // @todo not supported yet in core
+            $on = '';
+            break;
+        case 'alpha':
+            // @todo not support yet because both title
+            // and name columns are used for this depending
+            // on the entity, which we don't always know.  >:O
+            break;
+    }
+    $order = strtolower($order);
+    if ($order != 'asc' && $order != 'desc') {
+        $order = 'DESC';
+    }
+
+    if ($on) {
+        $order_by = "$on $order";
+    } else {
+        $order_by = '';
+    }
+
+    return $order_by;
 }
 
 /**
@@ -453,13 +453,13 @@ 
  * @return string
  */
 function search_exclude_robots($hook, $type, $text) {
-	$text .= <<<TEXT
+    $text .= <<<TEXT
 User-agent: *
 Disallow: /search/
 
 TEXT;
 
-	return $text;
+    return $text;
 }
 
 /**
@@ -469,26 +469,26 @@ 
  * @return array
  */
 function search_output_tag(\Elgg\Hook $hook) {
-	$vars = $hook->getValue();
-	if (isset($vars['href'])) {
-		// leave unaltered
-		return;
-	}
+    $vars = $hook->getValue();
+    if (isset($vars['href'])) {
+        // leave unaltered
+        return;
+    }
 	
-	$query_params = [
-		'q' => elgg_extract('value', $vars),
-		'search_type' => 'tags',
-		'type' => elgg_extract('type', $vars, null, false),
-		'subtype' => elgg_extract('subtype', $vars, null, false),
-	];
+    $query_params = [
+        'q' => elgg_extract('value', $vars),
+        'search_type' => 'tags',
+        'type' => elgg_extract('type', $vars, null, false),
+        'subtype' => elgg_extract('subtype', $vars, null, false),
+    ];
 		
-	$url = elgg_extract('base_url', $vars, 'search');
+    $url = elgg_extract('base_url', $vars, 'search');
 	
-	unset($vars['base_url']);
-	unset($vars['type']);
-	unset($vars['subtype']);
+    unset($vars['base_url']);
+    unset($vars['type']);
+    unset($vars['subtype']);
 	
-	$vars['href'] = elgg_http_add_url_query_elements($url, $query_params);
+    $vars['href'] = elgg_http_add_url_query_elements($url, $query_params);
 	
-	return $vars;
+    return $vars;
 }