strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rework autocomplete: some polishing

Browse source
This commit is contained in:
rabuzarus 2016-04-14 17:05:19 +02:00
parent 01b02dbcaa
commit ce1faf17d1
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/DirSearch.php
View file

@ -1,7 +1,8 @@
<?php <?php
/** /**
* @file include/dir.php * @file include/DirSearch.php
* @brief This file includes the DirSearch class with directory related functions
*/ */
@ -15,7 +16,7 @@ class DirSearch {
* * * *
* @param string $search Name or nick * @param string $search Name or nick
* @param string $mode Search mode * @param string $mode Search mode
* @return array * @return array with search results
*/ */
public static function global_search_by_name($search, $mode = '') { public static function global_search_by_name($search, $mode = '') {
@ -51,6 +52,7 @@ class DirSearch {
intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND), intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
dbesc(escape_tags($search)), dbesc(escape_tags($search))); dbesc(escape_tags($search)), dbesc(escape_tags($search)));
return $results; return $results;
} }

6
include/Smilies.php
View file

@ -122,7 +122,7 @@ class Smilies {
* @param string $s * @param string $s
* @param boolean $sample * @param boolean $sample
* *
* @return string * @return string HML Output of the Smilie
*/ */
public static function replace($s, $sample = false) { public static function replace($s, $sample = false) {
if(intval(get_config('system','no_smilies')) if(intval(get_config('system','no_smilies'))
@ -165,7 +165,9 @@ class Smilies {
* @brief expand <3333 to the correct number of hearts * @brief expand <3333 to the correct number of hearts
* *
* @param string $x * @param string $x
* @return string * @return string HTML Output
*
* @todo: Rework because it doesn't work correctly
*/ */
private function preg_heart($x) { private function preg_heart($x) {
if(strlen($x[1]) == 1) if(strlen($x[1]) == 1)

4
include/acl_selectors.php
View file

@ -663,7 +663,7 @@ function acl_lookup(&$a, $out_type = 'json') {
* @brief Searching for global contacts for autocompletion * @brief Searching for global contacts for autocompletion
* *
* @param App $a * @param App $a
* @return array * @return array with the search results
*/ */
function navbar_complete(&$a) { function navbar_complete(&$a) {
@ -704,4 +704,4 @@ function navbar_complete(&$a) {
} }
} }
return; return;
} }

2
include/network.php
View file

@ -1294,7 +1294,7 @@ function short_link($url) {
* and adds an application/json HTTP header to the output. * and adds an application/json HTTP header to the output.
* After finishing the process is getting killed. * After finishing the process is getting killed.
* *
* @param array $x * @param array $x The input content
*/ */
function json_return_and_die($x) { function json_return_and_die($x) {
header("content-type: application/json"); header("content-type: application/json");

2
mod/smilies.php
View file

@ -16,6 +16,6 @@ function smilies_content(&$a) {
json_return_and_die($results); json_return_and_die($results);
} }
else { else {
return smilies('',true); return Smilies::replace('',true);
} }
} }