aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas <rat@rlyeh-military-affairs>2012-03-06 20:50:38 +0000
committerThomas <rat@rlyeh-military-affairs>2012-03-06 20:50:38 +0000
commit67456bad067dd06c5775979c07c25c767164da36 (patch)
tree2615c9545fa99c6577a0dce89e441e6743af8223 /include
parenta265afe7eb43bfe494669ee245c97bd7460fb671 (diff)
downloadvolse-hubzilla-67456bad067dd06c5775979c07c25c767164da36.tar.gz
volse-hubzilla-67456bad067dd06c5775979c07c25c767164da36.tar.bz2
volse-hubzilla-67456bad067dd06c5775979c07c25c767164da36.zip
Fixed...merged with mainline THEN added beards.
Diffstat (limited to 'include')
-rw-r--r--include/text.php41
1 files changed, 36 insertions, 5 deletions
diff --git a/include/text.php b/include/text.php
index 2667ddddc..e7c95d35c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -14,7 +14,13 @@ if(! function_exists('replace_macros')) {
function replace_macros($s,$r) {
global $t;
- return $t->replace($s,$r);
+ //$ts = microtime();
+ $r = $t->replace($s,$r);
+ //$tt = microtime() - $ts;
+
+ //$a = get_app();
+ //$a->page['debug'] .= "$tt <br>\n";
+ return $r;
}}
@@ -731,9 +737,10 @@ function smilies($s, $sample = false) {
':headdesk',
'~friendika',
'~friendica',
- 'Diaspora*',
+// 'Diaspora*'
':beard',
':whitebeard'
+
);
$icons = array(
@@ -774,10 +781,9 @@ function smilies($s, $sample = false) {
'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
- '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
+// '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
'<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
'<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
-
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -790,6 +796,7 @@ function smilies($s, $sample = false) {
}
}
else {
+ $params['string'] = preg_replace_callback('/&lt;(3+)/','preg_heart',$params['string']);
$s = str_replace($params['texts'],$params['icons'],$params['string']);
}
@@ -808,7 +815,18 @@ function smile_decode($m) {
return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
}
+// expand <3333 to the correct number of hearts
+function preg_heart($x) {
+ $a = get_app();
+ if(strlen($x[1]) == 1)
+ return $x[0];
+ $t = '';
+ for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
+ $t .= '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />';
+ $r = str_replace($x[0],$t,$x[0]);
+ return $r;
+}
if(! function_exists('day_translate')) {
@@ -1000,7 +1018,7 @@ function lang_selector() {
}
$ll = substr($l,5);
$ll = substr($ll,0,strrpos($ll,'/'));
- $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : '');
+ $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : '');
$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
}
}
@@ -1205,3 +1223,16 @@ function reltoabs($text, $base)
return $text;
}
+function item_post_type($item) {
+ if(intval($item['event-id']))
+ return t('event');
+ if(strlen($item['resource-id']))
+ return t('photo');
+ if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST)
+ return t('activity');
+ if($item['id'] != $item['parent'])
+ return t('comment');
+ return t('post');
+}
+
+