X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=e2d2e05d37b27dce1da34010bcc9f02fffd16976;hb=a201d5b9cc22d11f7650643aa1ea6d015a6359be;hp=c7681a4d58cb2485a8e34ac623d89440a4a36404;hpb=4d21671f75e35e7c2880467dddc0936e8c718d8c;p=friendica.git
diff --git a/include/text.php b/include/text.php
index c7681a4d58..e2d2e05d37 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2,6 +2,7 @@
require_once("include/template_processor.php");
require_once("include/friendica_smarty.php");
+require_once("include/Smilies.php");
require_once("include/map.php");
require_once("mod/proxy.php");
@@ -285,7 +286,7 @@ function paginate_data(&$a, $count=null) {
if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
$stripped .= "&offset=".urlencode($a->page_offset);
- $url = z_root() . '/' . $stripped;
+ $url = $stripped;
$data = array();
function _l(&$d, $name, $url, $text, $class="") {
@@ -923,7 +924,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
if($redirect) {
$a = get_app();
- $redirect_url = z_root() . '/redir/' . $contact['id'];
+ $redirect_url = 'redir/' . $contact['id'];
if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
$redir = true;
$url = $redirect_url;
@@ -964,13 +965,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'),
@@ -1080,7 +1081,6 @@ function get_mood_verbs() {
}
-
if(! function_exists('smilies')) {
/**
* Replaces text emoticons with graphical images
@@ -1148,41 +1148,41 @@ function smilies($s, $sample = false) {
);
$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'
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '~friendica ',
+ 'redmatrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1305,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 = z_root() . '/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']);
}
}
@@ -1421,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 = z_root() . '/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];
@@ -1549,7 +1549,7 @@ function prepare_text($text) {
if(stristr($text,'[nosmile]'))
$s = bbcode($text);
else
- $s = smilies(bbcode($text));
+ $s = Smilies::replace(bbcode($text));
return trim($s);
}}
@@ -1596,7 +1596,7 @@ function get_cats_and_terms($item) {
$categories[] = array(
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
'first' => $first,
'last' => false
);
@@ -1614,7 +1614,7 @@ function get_cats_and_terms($item) {
$folders[] = array(
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?z_root() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
'first' => $first,
'last' => false
);
@@ -1639,15 +1639,15 @@ function get_plink($item) {
if ($a->user['nickname'] != "") {
$ret = array(
- //'href' => z_root()."/display/".$a->user['nickname']."/".$item['id'],
- 'href' => z_root()."/display/".$item['guid'],
- 'orig' => z_root()."/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');
}