' . "\r\n";
}
}}
@@ -937,36 +984,49 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
if(! function_exists('search')) {
/**
* search box
- *
+ *
* @param string $s search query
* @param string $id html id
* @param string $url search url
- * @param boolean $save show save search button
- * @return string html for search box #FIXME: remove html
+ * @param boolean $savedsearch show save search button
*/
-function search($s,$id='search-box',$url='/search',$save = false) {
+function search($s,$id='search-box',$url='/search',$save = false, $aside = true) {
$a = get_app();
- $o = '
';
- $o .= '
';
- return $o;
+
+ $values = array(
+ '$s' => $s,
+ '$id' => $id,
+ '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
+ '$search_label' => t('Search'),
+ '$save_label' => t('Save'),
+ '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+ );
+
+ if (!$aside) {
+ $values['$searchoption'] = array(
+ t("Full Text"),
+ t("Tags"),
+ t("Contacts"));
+
+ if (get_config('system','poco_local_search'))
+ $values['$searchoption'][] = t("Forums");
+ }
+
+ return replace_macros(get_markup_template('searchbox.tpl'), $values);
}}
if(! function_exists('valid_email')) {
/**
* Check if $x is a valid email string
- *
+ *
* @param string $x
* @return boolean
*/
function valid_email($x){
- if(get_config('system','disable_email_validation'))
- return true;
+ // Removed because Fabio told me so.
+ //if(get_config('system','disable_email_validation'))
+ // return true;
if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
return true;
@@ -995,7 +1055,7 @@ function linkify($s) {
* @hook poke_verbs pokes array
*/
function get_poke_verbs() {
-
+
// index is present tense verb
// value is array containing past tense verb, translation of present, translation of past
@@ -1017,7 +1077,7 @@ function get_poke_verbs() {
* @hook mood_verbs moods array
*/
function get_mood_verbs() {
-
+
$arr = array(
'happy' => t('happy'),
'sad' => t('sad'),
@@ -1052,10 +1112,10 @@ if(! function_exists('smilies')) {
* Replaces text emoticons with graphical images
*
* It is expected that this function will be called using HTML text.
- * We will escape text between HTML pre and code blocks from being
- * processed.
- *
- * At a higher level, the bbcode [nosmile] tag can be used to prevent this
+ * We will escape text between HTML pre and code blocks from being
+ * processed.
+ *
+ * At a higher level, the bbcode [nosmile] tag can be used to prevent this
* function from being executed by the prepare_text() routine when preparing
* bbcode source for HTML display
*
@@ -1067,55 +1127,56 @@ if(! function_exists('smilies')) {
function smilies($s, $sample = false) {
$a = get_app();
- if(intval(get_config('system','no_smilies'))
+ if(intval(get_config('system','no_smilies'))
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
return $s;
$s = preg_replace_callback('/
(.*?)<\/pre>/ism','smile_encode',$s);
$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
- $texts = array(
- '<3',
- '</3',
- '<\\3',
- ':-)',
- ';-)',
- ':-(',
- ':-P',
- ':-p',
- ':-"',
- ':-"',
- ':-x',
- ':-X',
- ':-D',
- '8-|',
- '8-O',
- ':-O',
- '\\o/',
- 'o.O',
- 'O.o',
- 'o_O',
- 'O_o',
- ":'(",
- ":-!",
- ":-/",
- ":-[",
+ $texts = array(
+ '<3',
+ '</3',
+ '<\\3',
+ ':-)',
+ ';-)',
+ ':-(',
+ ':-P',
+ ':-p',
+ ':-"',
+ ':-"',
+ ':-x',
+ ':-X',
+ ':-D',
+ '8-|',
+ '8-O',
+ ':-O',
+ '\\o/',
+ 'o.O',
+ 'O.o',
+ 'o_O',
+ 'O_o',
+ ":'(",
+ ":-!",
+ ":-/",
+ ":-[",
"8-)",
- ':beer',
- ':homebrew',
- ':coffee',
+ ':beer',
+ ':homebrew',
+ ':coffee',
':facepalm',
':like',
':dislike',
'~friendica',
- 'red#'
+ 'red#',
+ 'red#matrix'
);
$icons = array(
- '',
- '',
- '',
+ '',
+ '',
+ '',
'',
'',
'',
@@ -1128,7 +1189,7 @@ function smilies($s, $sample = false) {
'',
'',
'',
- '',
+ '',
'',
'',
'',
@@ -1146,7 +1207,8 @@ function smilies($s, $sample = false) {
'',
'',
'~friendica ',
- 'red '
+ 'redmatrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1181,7 +1243,7 @@ function smile_decode($m) {
/**
* expand <3333 to the correct number of hearts
- *
+ *
* @param string $x
* @return string
*/
@@ -1191,7 +1253,7 @@ function preg_heart($x) {
return $x[0];
$t = '';
for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
- $t .= '';
+ $t .= '';
$r = str_replace($x[0],$t,$x[0]);
return $r;
}
@@ -1200,7 +1262,7 @@ function preg_heart($x) {
if(! function_exists('day_translate')) {
/**
* Translate days and months names
- *
+ *
* @param string $s
* @return string
*/
@@ -1220,7 +1282,7 @@ function day_translate($s) {
if(! function_exists('normalise_link')) {
/**
* Normalize url
- *
+ *
* @param string $url
* @return string
*/
@@ -1234,15 +1296,15 @@ function normalise_link($url) {
if(! function_exists('link_compare')) {
/**
* Compare two URLs to see if they are the same, but ignore
- * slight but hopefully insignificant differences such as if one
- * is https and the other isn't, or if one is www.something and
+ * slight but hopefully insignificant differences such as if one
+ * is https and the other isn't, or if one is www.something and
* the other isn't - and also ignore case differences.
*
* @param string $a first url
* @param string $b second url
* @return boolean True if the URLs match, otherwise False
*
- */
+ */
function link_compare($a,$b) {
if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
return true;
@@ -1253,7 +1315,7 @@ function link_compare($a,$b) {
if(! function_exists('redir_private_images')) {
/**
* Find any non-embedded images in private items and add redir links to them
- *
+ *
* @param App $a
* @param array $item
*/
@@ -1277,6 +1339,28 @@ function redir_private_images($a, &$item) {
}}
+function put_item_in_cache(&$item, $update = false) {
+
+ if (($item["rendered-hash"] != hash("md5", $item["body"])) OR ($item["rendered-hash"] == "") OR
+ ($item["rendered-html"] == "") OR get_config("system", "ignore_cache")) {
+
+ // The function "redir_private_images" changes the body.
+ // I'm not sure if we should store it permanently, so we save the old value.
+ $body = $item["body"];
+
+ $a = get_app();
+ redir_private_images($a, $item);
+
+ $item["rendered-html"] = prepare_text($item["body"]);
+ $item["rendered-hash"] = hash("md5", $item["body"]);
+ $item["body"] = $body;
+
+ if ($update AND ($item["id"] != 0)) {
+ q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
+ dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"]));
+ }
+ }
+}
// Given an item array, convert the body element from bbcode to html and add smilie icons.
// If attach is true, also add icons for item attachments
@@ -1285,7 +1369,7 @@ if(! function_exists('prepare_body')) {
/**
* Given an item array, convert the body element from bbcode to html and add smilie icons.
* If attach is true, also add icons for item attachments
- *
+ *
* @param array $item
* @param boolean $attach
* @return string item body html
@@ -1328,30 +1412,8 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$item['hashtags'] = $hashtags;
$item['mentions'] = $mentions;
-
- //$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
- $cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
-
- if (($cachefile != '')) {
- if (file_exists($cachefile)) {
- $stamp1 = microtime(true);
- $s = file_get_contents($cachefile);
- $a->save_timestamp($stamp1, "file");
- } else {
- redir_private_images($a, $item);
- $s = prepare_text($item['body']);
-
- $stamp1 = microtime(true);
- file_put_contents($cachefile, $s);
- $a->save_timestamp($stamp1, "file");
-
- logger('prepare_body: put item '.$item["id"].' into cachefile '.$cachefile);
- }
- } else {
- redir_private_images($a, $item);
- $s = prepare_text($item['body']);
- }
-
+ put_item_in_cache($item, true);
+ $s = $item["rendered-html"];
$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr);
@@ -1439,6 +1501,14 @@ function prepare_body(&$item,$attach = false, $preview = false) {
}
$s = $s . $as;
+ // map
+ if(strpos($s,'
 . '/images/smiley-heart.gif)
',
- ' . '/images/smiley-brokenheart.gif)
',
- ' . '/images/smiley-smile.gif)
',
' . '/images/smiley-wink.gif)
',
' . '/images/smiley-frown.gif)
',
@@ -1128,7 +1189,7 @@ function smilies($s, $sample = false) {
' . '/images/smiley-laughing.gif)
',
' . '/images/smiley-surprised.gif)
',
' . '/images/smiley-thumbsup.gif)
',
' . '/images/smiley-Oo.gif)
',
' . '/images/like.gif)
',
' . '/images/dislike.gif)
',
'~friendica  . '/images/friendica-16.png)
',
- 'red  . '/images/rhash-16.png)
'
+ 'red . '/images/rm-16.png)
matrix',
+ 'red