added beard smileys

diff --git a/images/beard.jpg b/images/beard.jpg
new file mode 100644 (file)
index 0000000..d65e0c3
Binary files /dev/null and b/images/beard.jpg differ

diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
new file mode 100644 (file)
index 0000000..363eba6
Binary files /dev/null and b/images/whitebeard.jpg differ

diff --git a/include/text.php b/include/text.php
old mode 100755 (executable)
new mode 100644 (file)
index c8c0317..2667ddd
--- a/include/text.php
+++ b/include/text.php
@@ -14,13 +14,7 @@ if(! function_exists('replace_macros')) {
 function replace_macros($s,$r) {
        global $t;
        
-       //$ts = microtime();
-       $r =  $t->replace($s,$r);
-       //$tt = microtime() - $ts;
-       
-       //$a = get_app();
-       //$a->page['debug'] .= "$tt <br>\n";
-       return $r;
+       return $t->replace($s,$r);
 
 }}
 
@@ -737,7 +731,9 @@ function smilies($s, $sample = false) {
                ':headdesk',
                '~friendika', 
                '~friendica', 
-//             'Diaspora*' 
+               'Diaspora*', 
+               ':beard',
+               ':whitebeard'
        );
 
        $icons = array(
@@ -778,7 +774,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" />'
 
        );
 
@@ -792,7 +790,6 @@ 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']);
        }
 
@@ -811,18 +808,7 @@ 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')) {
@@ -1014,7 +1000,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>';
                }
        }
@@ -1219,16 +1205,3 @@ 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');
-}
-
-