';
return $o;
}}
@@ -935,7 +961,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
if(! function_exists('valid_email')) {
/**
* Check if $x is a valid email string
- *
+ *
* @param string $x
* @return boolean
*/
@@ -957,7 +983,7 @@ if(! function_exists('linkify')) {
* @param string $s
*/
function linkify($s) {
- $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s);
+ $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s);
$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
return($s);
}}
@@ -971,7 +997,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
@@ -993,7 +1019,7 @@ function get_poke_verbs() {
* @hook mood_verbs moods array
*/
function get_mood_verbs() {
-
+
$arr = array(
'happy' => t('happy'),
'sad' => t('sad'),
@@ -1028,10 +1054,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
*
@@ -1043,48 +1069,49 @@ 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'
);
@@ -1104,7 +1131,7 @@ function smilies($s, $sample = false) {
'',
'',
'',
- '',
+ '',
'',
'',
'',
@@ -1122,7 +1149,8 @@ function smilies($s, $sample = false) {
'',
'',
'~friendica ',
- 'red '
+ 'redmatrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1157,7 +1185,7 @@ function smile_decode($m) {
/**
* expand <3333 to the correct number of hearts
- *
+ *
* @param string $x
* @return string
*/
@@ -1176,7 +1204,7 @@ function preg_heart($x) {
if(! function_exists('day_translate')) {
/**
* Translate days and months names
- *
+ *
* @param string $s
* @return string
*/
@@ -1196,7 +1224,7 @@ function day_translate($s) {
if(! function_exists('normalise_link')) {
/**
* Normalize url
- *
+ *
* @param string $url
* @return string
*/
@@ -1210,15 +1238,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;
@@ -1229,7 +1257,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
*/
@@ -1261,7 +1289,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
@@ -1269,7 +1297,7 @@ if(! function_exists('prepare_body')) {
* @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
* @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
*/
-function prepare_body(&$item,$attach = false) {
+function prepare_body(&$item,$attach = false, $preview = false) {
$a = get_app();
call_hooks('prepare_body_init', $item);
@@ -1290,13 +1318,13 @@ function prepare_body(&$item,$attach = false) {
$tag["url"] = $searchpath.strtolower($tag["term"]);
if ($tag["type"] == TERM_HASHTAG) {
- $hashtags[] = "#".$tag["term"]."";
+ $hashtags[] = "#".$tag["term"]."";
$prefix = "#";
} elseif ($tag["type"] == TERM_MENTION) {
- $mentions[] = "@".$tag["term"]."";
+ $mentions[] = "@".$tag["term"]."";
$prefix = "@";
}
- $tags[] = $prefix."".$tag["term"]."";
+ $tags[] = $prefix."".$tag["term"]."";
}
}
@@ -1305,8 +1333,7 @@ function prepare_body(&$item,$attach = false) {
$item['mentions'] = $mentions;
- //$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
- $cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
+ $cachefile = get_cachefile(urlencode($item["guid"])."-".hash("md5", $item['body']));
if (($cachefile != '')) {
if (file_exists($cachefile)) {
@@ -1328,8 +1355,10 @@ function prepare_body(&$item,$attach = false) {
$s = prepare_text($item['body']);
}
+ require_once("mod/proxy.php");
+ $s = proxy_parse_html($s);
- $prep_arr = array('item' => $item, 'html' => $s);
+ $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
@@ -1407,7 +1436,7 @@ function prepare_body(&$item,$attach = false) {
$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
$title .= ' ' . $mtch[2] . ' ' . t('bytes');
- $as .= '' . $icon . '';
+ $as .= '' . $icon . '';
}
}
}
@@ -1446,6 +1475,13 @@ function prepare_body(&$item,$attach = false) {
$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
}
+ // replace friendica image url size with theme preference
+ if (x($a->theme_info,'item_image_size')){
+ $ps = $a->theme_info['item_image_size'];
+
+ $s = preg_replace('|(]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|',"$1-".$ps, $s);
+ }
+
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
@@ -1456,7 +1492,7 @@ function prepare_body(&$item,$attach = false) {
if(! function_exists('prepare_text')) {
/**
* Given a text string, convert from bbcode to html and add smilie icons.
- *
+ *
* @param string $text
* @return string
*/
@@ -1469,17 +1505,17 @@ function prepare_text($text) {
else
$s = smilies(bbcode($text));
- return $s;
+ return trim($s);
}}
/**
* return array with details for categories and folders for an item
- *
+ *
* @param array $item
* @return array
- *
+ *
* [
* [ // categories array
* {
@@ -1497,7 +1533,7 @@ function prepare_text($text) {
* 'first': 'is the first in this array? true/false',
* 'last': 'is the last in this array? true/false',
* } ,
- * ....
+ * ....
* ]
* ]
*/
@@ -1522,7 +1558,7 @@ function get_cats_and_terms($item) {
}
}
if (count($categories)) $categories[count($categories)-1]['last'] = true;
-
+
if(local_user() == $item['uid']) {
$matches = false; $first = true;
@@ -1587,10 +1623,10 @@ function feed_salmonlinks($nick) {
$salmon = '' . "\n" ;
- // old style links that status.net still needed as of 12/2010
+ // old style links that status.net still needed as of 12/2010
- $salmon .= ' ' . "\n" ;
- $salmon .= ' ' . "\n" ;
+ $salmon .= ' ' . "\n" ;
+ $salmon .= ' ' . "\n" ;
return $salmon;
}}
@@ -1601,16 +1637,31 @@ if(! function_exists('get_plink')) {
* @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
*/
function get_plink($item) {
- $a = get_app();
- if (x($item,'plink') && ($item['private'] != 1)) {
- return array(
- 'href' => $item['plink'],
- 'title' => t('link to source'),
- );
- }
- else {
- return false;
- }
+ $a = get_app();
+
+ if ($a->user['nickname'] != "") {
+ $ret = array(
+ //'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
+ 'href' => $a->get_baseurl()."/display/".$item['guid'],
+ 'orig' => $a->get_baseurl()."/display/".$item['guid'],
+ 'title' => t('link to source'),
+ );
+
+ if (x($item,'plink'))
+ $ret["href"] = $item['plink'];
+
+ } elseif (x($item,'plink') && ($item['private'] != 1))
+ $ret = array(
+ 'href' => $item['plink'],
+ 'orig' => $item['plink'],
+ 'title' => t('link to source'),
+ );
+ else
+ $ret = array();
+
+ //if (x($item,'plink') && ($item['private'] != 1))
+
+ return($ret);
}}
if(! function_exists('unamp')) {
@@ -1630,17 +1681,17 @@ if(! function_exists('lang_selector')) {
/**
* get html for language selector
* @global string $lang
- * @return string
+ * @return string
* @template lang_selector.tpl
*/
function lang_selector() {
global $lang;
-
+
$langs = glob('view/*/strings.php');
-
+
$lang_options = array();
$selected = "";
-
+
if(is_array($langs) && count($langs)) {
$langs[] = '';
if(! in_array('view/en/strings.php',$langs))
@@ -1658,11 +1709,11 @@ function lang_selector() {
}
}
- $tpl = get_markup_template("lang_selector.tpl");
+ $tpl = get_markup_template("lang_selector.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Select an alternate language'),
'$langs' => array($lang_options, $selected),
-
+
));
return $o;
}}
@@ -1750,7 +1801,7 @@ function base64url_decode($s) {
if (!function_exists('str_getcsv')) {
/**
* Parse csv string
- *
+ *
* @param string $input
* @param string $delimiter
* @param string $enclosure
@@ -1795,13 +1846,13 @@ if (!function_exists('str_getcsv')) {
}
} else {
$line = preg_split("/".$delimiter."/",$line);
-
+
/*
* Validating against pesky extra line breaks creating false rows.
*/
if (is_array($line) && !empty($line[0])) {
$output[$line_num] = $line;
- }
+ }
}
}
return $output;
@@ -1812,7 +1863,7 @@ if (!function_exists('str_getcsv')) {
return false;
}
}
-}
+}
/**
* return div element with class 'clear'
@@ -1836,7 +1887,7 @@ function bb_translate_video($s) {
$s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s);
}
}
- return $s;
+ return $s;
}
function html2bb_video($s) {
@@ -1867,7 +1918,7 @@ function array_xmlify($val){
/**
* transorm link href and img src from relative to absolute
- *
+ *
* @param string $text
* @param string $base base url
* @return string
@@ -1880,7 +1931,7 @@ function reltoabs($text, $base)
$base = rtrim($base,'/');
$base2 = $base . "/";
-
+
// Replace links
$pattern = "/]*) href=\"(?!http|https|\/)([^\"]*)\"/";
$replace = "','[',']'),array('%3c','%3e','%5b','%5d'),$s);
@@ -2003,10 +2054,12 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
if($type == 'file') {
$lbracket = '[';
$rbracket = ']';
+ $termtype = TERM_FILE;
}
else {
$lbracket = '<';
$rbracket = '>';
+ $termtype = TERM_CATEGORY;
}
$filetags_updated = $saved;
@@ -2032,9 +2085,15 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
}
foreach($deleted_tags as $key => $tag) {
- $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
- intval($uid)
- );
+ $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+ dbesc($tag),
+ intval(TERM_OBJ_POST),
+ intval($termtype),
+ intval($uid));
+
+ //$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
+ // intval($uid)
+ //);
if(count($r)) {
unset($deleted_tags[$key]);
@@ -2057,6 +2116,8 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
}
function file_tag_save_file($uid,$item,$file) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
@@ -2066,11 +2127,14 @@ function file_tag_save_file($uid,$item,$file) {
);
if(count($r)) {
if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
intval($item),
intval($uid)
);
+
+ create_files_from_item($item);
+
$saved = get_pconfig($uid,'system','filetags');
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
@@ -2080,14 +2144,19 @@ function file_tag_save_file($uid,$item,$file) {
}
function file_tag_unsave_file($uid,$item,$file,$cat = false) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
- if($cat == true)
+ if($cat == true) {
$pattern = '<' . file_tag_encode($file) . '>' ;
- else
+ $termtype = TERM_CATEGORY;
+ } else {
$pattern = '[' . file_tag_encode($file) . ']' ;
+ $termtype = TERM_FILE;
+ }
$r = q("select file from item where id = %d and uid = %d limit 1",
@@ -2097,15 +2166,22 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
if(! count($r))
return false;
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc(str_replace($pattern,'',$r[0]['file'])),
intval($item),
intval($uid)
);
- $r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
- intval($uid)
- );
+ create_files_from_item($item);
+
+ $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+ dbesc($file),
+ intval(TERM_OBJ_POST),
+ intval($termtype),
+ intval($uid));
+
+ //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
+ //);
if(! count($r)) {
$saved = get_pconfig($uid,'system','filetags');
@@ -2122,7 +2198,7 @@ function normalise_openid($s) {
function undo_post_tagging($s) {
$matches = null;
- $cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
+ $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
@@ -2155,3 +2231,22 @@ function is_a_date_arg($s) {
}
return false;
}
+
+/**
+ * remove intentation from a text
+ */
+function deindent($text, $chr="[\t ]", $count=NULL) {
+ $text = fix_mce_lf($text);
+ $lines = explode("\n", $text);
+ if (is_null($count)) {
+ $m = array();
+ $k=0; while($k
 . '/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