X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=07524e851dd2f11baf9b3e7ffefacfe953ce6ee7;hb=08a780211211c79053a710866fa2057f648a6d51;hp=b5010864e68853b82c2f93b1e0c6f7b7941d5262;hpb=808eaa633a784c094dd5c2b79f541c911bec782e;p=friendica.git
diff --git a/include/text.php b/include/text.php
index b5010864e6..07524e851d 100644
--- a/include/text.php
+++ b/include/text.php
@@ -21,6 +21,10 @@ function replace_macros($s,$r) {
$a = get_app();
+ // pass $baseurl to all templates
+ $r['$baseurl'] = $a->get_baseurl();
+
+
$t = $a->template_engine();
try {
$output = $t->replace_macros($s,$r);
@@ -138,31 +142,31 @@ function autoname($len) {
'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh');
$start = mt_rand(0,2);
- if($start == 0)
- $table = $vowels;
- else
- $table = $cons;
+ if($start == 0)
+ $table = $vowels;
+ else
+ $table = $cons;
$word = '';
for ($x = 0; $x < $len; $x ++) {
- $r = mt_rand(0,count($table) - 1);
- $word .= $table[$r];
+ $r = mt_rand(0,count($table) - 1);
+ $word .= $table[$r];
- if($table == $vowels)
- $table = array_merge($cons,$midcons);
- else
- $table = $vowels;
+ if($table == $vowels)
+ $table = array_merge($cons,$midcons);
+ else
+ $table = $vowels;
}
$word = substr($word,0,$len);
foreach($noend as $noe) {
- if((strlen($word) > 2) && (substr($word,-2) == $noe)) {
- $word = substr($word,0,-1);
- break;
- }
+ if((strlen($word) > 2) && (substr($word,-2) == $noe)) {
+ $word = substr($word,0,-1);
+ break;
+ }
}
if(substr($word,-1) == 'q')
$word = substr($word,0,-1);
@@ -281,7 +285,7 @@ function paginate_data(&$a, $count=null) {
if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
$stripped .= "&offset=".urlencode($a->page_offset);
- $url = $a->get_baseurl() . '/' . $stripped;
+ $url = $stripped;
$data = array();
function _l(&$d, $name, $url, $text, $class="") {
@@ -825,35 +829,6 @@ function qp($s) {
return str_replace ("%","=",rawurlencode($s));
}}
-
-
-if(! function_exists('get_mentions')) {
-/**
- * @param array $item
- * @return string html for mentions #FIXME: remove html
- */
-function get_mentions($item) {
- $o = '';
- if(! strlen($item['tag']))
- return $o;
-
- $arr = explode(',',$item['tag']);
- foreach($arr as $x) {
- $matches = null;
- if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
- $o .= "\t\t" . '' . "\r\n";
- $o .= "\t\t" . '' . "\r\n";
- }
- }
-
- if (!$item['private']) {
- $o .= "\t\t".''."\r\n";
- $o .= "\t\t".''."\r\n";
- }
-
- return $o;
-}}
-
if(! function_exists('contact_block')) {
/**
* Get html for contact block.
@@ -891,9 +866,9 @@ function contact_block() {
$micropro = Null;
} else {
- $r = q("SELECT * FROM `contact`
- WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
- AND `hidden` = 0 AND `archive` = 0
+ $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `micro`, `network` FROM `contact`
+ WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
+ AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
intval($a->profile['uid']),
dbesc(NETWORK_DFRN),
@@ -939,13 +914,16 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
if($class)
$class = ' ' . $class;
+ if ($contact["addr"] == "")
+ $contact["addr"] = $contact["url"];
+
$url = $contact['url'];
$sparkle = '';
$redir = false;
if($redirect) {
$a = get_app();
- $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id'];
+ $redirect_url = 'redir/' . $contact['id'];
if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
$redir = true;
$url = $redirect_url;
@@ -962,7 +940,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
. (($click) ? ' fakelink' : '') . '" '
. (($redir) ? ' target="redir" ' : '')
. (($url) ? ' href="' . $url . '"' : '') . $click
- . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+ . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name']
. '" >'. $contact['name'] . '' . "\r\n";
}
else {
@@ -970,7 +948,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
. (($click) ? ' fakelink' : '') . '" '
. (($redir) ? ' target="redir" ' : '')
. (($url) ? ' href="' . $url . '"' : '') . $click . ' >![' . $contact['name']
+ . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . ']('
- . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . ' "' . $contact['name'] . ' [' . $contact['url'] . ']")
' . "\r\n";
}
}}
@@ -986,13 +964,13 @@ if(! function_exists('search')) {
* @param string $url search url
* @param boolean $savedsearch show save search button
*/
-function search($s,$id='search-box',$url='/search',$save = false, $aside = true) {
+function search($s,$id='search-box',$url='search',$save = false, $aside = true) {
$a = get_app();
$values = array(
'$s' => $s,
'$id' => $id,
- '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
+ '$action_url' => $url,
'$search_label' => t('Search'),
'$save_label' => t('Save'),
'$savedsearch' => feature_enabled(local_user(),'savedsearch'),
@@ -1008,7 +986,7 @@ function search($s,$id='search-box',$url='/search',$save = false, $aside = true)
$values['$searchoption'][] = t("Forums");
}
- return replace_macros(get_markup_template('searchbox.tpl'), $values);
+ return replace_macros(get_markup_template('searchbox.tpl'), $values);
}}
if(! function_exists('valid_email')) {
@@ -1163,48 +1141,48 @@ function smilies($s, $sample = false) {
':facepalm',
':like',
':dislike',
- '~friendica',
- 'red#',
+ '~friendica',
+ 'red#',
'red#matrix'
);
$icons = array(
- ' . '/images/smiley-heart.gif)
',
- ' . '/images/smiley-brokenheart.gif)
',
- '',
- ' . '/images/smiley-smile.gif)
',
- ' . '/images/smiley-wink.gif)
',
- ' . '/images/smiley-frown.gif)
',
- ' . '/images/smiley-tongue-out.gif)
',
- '',
- ' . '/images/smiley-kiss.gif)
',
- '',
- '',
- '',
- ' . '/images/smiley-laughing.gif)
',
- ' . '/images/smiley-surprised.gif)
',
- '',
- '',
- ' . '/images/smiley-thumbsup.gif)
',
- ' . '/images/smiley-Oo.gif)
',
- '',
- '',
- '',
- ' . '/images/smiley-cry.gif)
',
- ' . '/images/smiley-foot-in-mouth.gif)
',
- ' . '/images/smiley-undecided.gif)
',
- ' . '/images/smiley-embarassed.gif)
',
- ' . '/images/smiley-cool.gif)
',
- ' . '/images/beer_mug.gif)
',
- '',
- ' . '/images/coffee.gif)
',
- ' . '/images/smiley-facepalm.gif)
',
- ' . '/images/like.gif)
',
- ' . '/images/dislike.gif)
',
- '~friendica  . '/images/friendica-16.png)
',
- 'red . '/images/rm-16.png)
matrix',
- 'redmatrix'
+ ' . '/images/smiley-heart.gif)
',
+ ' . '/images/smiley-brokenheart.gif)
',
+ '',
+ ' . '/images/smiley-smile.gif)
',
+ ' . '/images/smiley-wink.gif)
',
+ ' . '/images/smiley-frown.gif)
',
+ ' . '/images/smiley-tongue-out.gif)
',
+ '',
+ ' . '/images/smiley-kiss.gif)
',
+ '',
+ '',
+ '',
+ ' . '/images/smiley-laughing.gif)
',
+ ' . '/images/smiley-surprised.gif)
',
+ '',
+ '',
+ ' . '/images/smiley-thumbsup.gif)
',
+ ' . '/images/smiley-Oo.gif)
',
+ '',
+ '',
+ '',
+ ' . '/images/smiley-cry.gif)
',
+ ' . '/images/smiley-foot-in-mouth.gif)
',
+ ' . '/images/smiley-undecided.gif)
',
+ ' . '/images/smiley-embarassed.gif)
',
+ ' . '/images/smiley-cool.gif)
',
+ ' . '/images/beer_mug.gif)
',
+ '',
+ ' . '/images/coffee.gif)
',
+ ' . '/images/smiley-facepalm.gif)
',
+ ' . '/images/like.gif)
',
+ ' . '/images/dislike.gif)
',
+ '~friendica  . '/images/friendica-16.png)
',
+ 'red . '/images/rm-16.png)
matrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1249,7 +1227,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;
}
@@ -1327,7 +1305,7 @@ function redir_private_images($a, &$item) {
if((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
//logger("redir_private_images: redir");
- $img_url = $a->get_baseurl() . '/redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
+ $img_url = 'redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
$item['body'] = str_replace($mtch[0], "[img]".$img_url."[/img]", $item['body']);
}
}
@@ -1378,7 +1356,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$a = get_app();
call_hooks('prepare_body_init', $item);
- $searchpath = $a->get_baseurl()."/search?tag=";
+ $searchpath = z_root()."/search?tag=";
$tags=array();
$hashtags = array();
@@ -1408,7 +1386,14 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$item['hashtags'] = $hashtags;
$item['mentions'] = $mentions;
- put_item_in_cache($item, true);
+ // Update the cached values if there is no "zrl=..." on the links
+ $update = (!local_user() and !remote_user() and ($item["uid"] == 0));
+
+ // Or update it if the current viewer is the intented viewer
+ if (($item["uid"] == local_user()) AND ($item["uid"] != 0))
+ $update = true;
+
+ put_item_in_cache($item, $update);
$s = $item["rendered-html"];
$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
@@ -1436,7 +1421,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$mime = $mtch[3];
if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
- $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+ $the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
else
$the_url = $mtch[1];
@@ -1444,10 +1429,10 @@ function prepare_body(&$item,$attach = false, $preview = false) {
if(!$vhead) {
$vhead = true;
$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
));
$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
));
}
@@ -1519,8 +1504,8 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $spoilersearch);
$rnd = random_string(8);
- $spoilerreplace = '
'.sprintf(t('Click to open/close')).''.
- '';
+ $spoilerreplace = '
'.sprintf(t('Click to open/close')).''.
+ '';
$s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch));
}
@@ -1531,17 +1516,17 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $authorsearch);
$rnd = random_string(8);
- $authorreplace = '
'.sprintf(t('Click to open/close')).''.
- '';
+ $authorreplace = '
'.sprintf(t('Click to open/close')).''.
+ '';
$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'];
+ // 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);
- }
+ $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);
@@ -1600,96 +1585,48 @@ function prepare_text($text) {
*/
function get_cats_and_terms($item) {
- $a = get_app();
- $categories = array();
- $folders = array();
-
- $matches = false; $first = true;
- $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
- if($cnt) {
- foreach($matches as $mtch) {
- $categories[] = array(
- 'name' => xmlify(file_tag_decode($mtch[1])),
- 'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
- 'first' => $first,
- 'last' => false
- );
- $first = false;
- }
- }
- if (count($categories)) $categories[count($categories)-1]['last'] = true;
-
-
- if(local_user() == $item['uid']) {
- $matches = false; $first = true;
- $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
- if($cnt) {
- foreach($matches as $mtch) {
- $folders[] = array(
- 'name' => xmlify(file_tag_decode($mtch[1])),
- 'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
- 'first' => $first,
- 'last' => false
- );
- $first = false;
- }
- }
- }
-
- if (count($folders)) $folders[count($folders)-1]['last'] = true;
-
- return array($categories, $folders);
-}
+ $a = get_app();
+ $categories = array();
+ $folders = array();
+ $matches = false; $first = true;
+ $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $categories[] = array(
+ 'name' => xmlify(file_tag_decode($mtch[1])),
+ 'url' => "#",
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'first' => $first,
+ 'last' => false
+ );
+ $first = false;
+ }
+ }
+ if (count($categories)) $categories[count($categories)-1]['last'] = true;
-if(! function_exists('feed_hublinks')) {
-/**
- * return atom link elements for all of our hubs
- * @return string hub link xml elements
- */
-function feed_hublinks() {
- $a = get_app();
- $hub = get_config('system','huburl');
-
- $hubxml = '';
- if(strlen($hub)) {
- $hubs = explode(',', $hub);
- if(count($hubs)) {
- foreach($hubs as $h) {
- $h = trim($h);
- if(! strlen($h))
- continue;
- if ($h === '[internal]')
- $h = $a->get_baseurl() . '/pubsubhubbub';
- $hubxml .= '' . "\n" ;
+ if(local_user() == $item['uid']) {
+ $matches = false; $first = true;
+ $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $folders[] = array(
+ 'name' => xmlify(file_tag_decode($mtch[1])),
+ 'url' => "#",
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'first' => $first,
+ 'last' => false
+ );
+ $first = false;
}
}
}
- return $hubxml;
-}}
+ if (count($folders)) $folders[count($folders)-1]['last'] = true;
-if(! function_exists('feed_salmonlinks')) {
-/**
- * return atom link elements for salmon endpoints
- * @param string $nick user nickname
- * @return string salmon link xml elements
- */
-function feed_salmonlinks($nick) {
-
- $a = get_app();
-
- $salmon = '' . "\n" ;
-
- // old style links that status.net still needed as of 12/2010
-
- $salmon .= ' ' . "\n" ;
- $salmon .= ' ' . "\n" ;
- return $salmon;
-}}
+ return array($categories, $folders);
+}
if(! function_exists('get_plink')) {
/**
@@ -1702,15 +1639,15 @@ function get_plink($item) {
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'],
+ //'href' => "display/".$a->user['nickname']."/".$item['id'],
+ 'href' => "display/".$item['guid'],
+ 'orig' => "display/".$item['guid'],
'title' => t('View on separate page'),
'orig_title' => t('view on separate page'),
);
if (x($item,'plink')) {
- $ret["href"] = $item['plink'];
+ $ret["href"] = $a->remove_baseurl($item['plink']);
$ret["title"] = t('link to source');
}
@@ -1746,13 +1683,12 @@ if(! function_exists('return_bytes')) {
* @return number
*/
function return_bytes ($size_str) {
- switch (substr ($size_str, -1))
- {
- case 'M': case 'm': return (int)$size_str * 1048576;
- case 'K': case 'k': return (int)$size_str * 1024;
- case 'G': case 'g': return (int)$size_str * 1073741824;
- default: return $size_str;
- }
+ switch (substr ($size_str, -1)) {
+ case 'M': case 'm': return (int)$size_str * 1048576;
+ case 'K': case 'k': return (int)$size_str * 1024;
+ case 'G': case 'g': return (int)$size_str * 1073741824;
+ default: return $size_str;
+ }
}}
/**
@@ -1829,60 +1765,60 @@ if (!function_exists('str_getcsv')) {
* @param string $eol
* @return boolean|array False on error, otherwise array[row][column]
*/
- function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {
- if (is_string($input) && !empty($input)) {
- $output = array();
- $tmp = preg_split("/".$eol."/",$input);
- if (is_array($tmp) && !empty($tmp)) {
- while (list($line_num, $line) = each($tmp)) {
- if (preg_match("/".$escape.$enclosure."/",$line)) {
- while ($strlen = strlen($line)) {
- $pos_delimiter = strpos($line,$delimiter);
- $pos_enclosure_start = strpos($line,$enclosure);
- if (
- is_int($pos_delimiter) && is_int($pos_enclosure_start)
- && ($pos_enclosure_start < $pos_delimiter)
- ) {
- $enclosed_str = substr($line,1);
- $pos_enclosure_end = strpos($enclosed_str,$enclosure);
- $enclosed_str = substr($enclosed_str,0,$pos_enclosure_end);
- $output[$line_num][] = $enclosed_str;
- $offset = $pos_enclosure_end+3;
- } else {
- if (empty($pos_delimiter) && empty($pos_enclosure_start)) {
- $output[$line_num][] = substr($line,0);
- $offset = strlen($line);
- } else {
- $output[$line_num][] = substr($line,0,$pos_delimiter);
- $offset = (
- !empty($pos_enclosure_start)
- && ($pos_enclosure_start < $pos_delimiter)
- )
- ?$pos_enclosure_start
- :$pos_delimiter+1;
- }
- }
- $line = substr($line,$offset);
- }
- } 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;
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
+function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {
+ if (is_string($input) && !empty($input)) {
+ $output = array();
+ $tmp = preg_split("/".$eol."/",$input);
+ if (is_array($tmp) && !empty($tmp)) {
+ while (list($line_num, $line) = each($tmp)) {
+ if (preg_match("/".$escape.$enclosure."/",$line)) {
+ while ($strlen = strlen($line)) {
+ $pos_delimiter = strpos($line,$delimiter);
+ $pos_enclosure_start = strpos($line,$enclosure);
+ if (
+ is_int($pos_delimiter) && is_int($pos_enclosure_start)
+ && ($pos_enclosure_start < $pos_delimiter)
+ ) {
+ $enclosed_str = substr($line,1);
+ $pos_enclosure_end = strpos($enclosed_str,$enclosure);
+ $enclosed_str = substr($enclosed_str,0,$pos_enclosure_end);
+ $output[$line_num][] = $enclosed_str;
+ $offset = $pos_enclosure_end+3;
+ } else {
+ if (empty($pos_delimiter) && empty($pos_enclosure_start)) {
+ $output[$line_num][] = substr($line,0);
+ $offset = strlen($line);
+ } else {
+ $output[$line_num][] = substr($line,0,$pos_delimiter);
+ $offset = (
+ !empty($pos_enclosure_start)
+ && ($pos_enclosure_start < $pos_delimiter)
+ )
+ ?$pos_enclosure_start
+ :$pos_delimiter+1;
+ }
+ }
+ $line = substr($line,$offset);
+ }
+ } 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;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+}
}
/**
@@ -1943,36 +1879,35 @@ function array_xmlify($val){
* @param string $base base url
* @return string
*/
-function reltoabs($text, $base)
-{
- if (empty($base))
- return $text;
+function reltoabs($text, $base) {
+ if (empty($base))
+ return $text;
- $base = rtrim($base,'/');
+ $base = rtrim($base,'/');
- $base2 = $base . "/";
+ $base2 = $base . "/";
- // Replace links
- $pattern = "/]*) href=\"(?!http|https|\/)([^\"]*)\"/";
- $replace = "