config: fix get_config and get_pconfig search for serialized array

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index a390a2855fdf8f38b24cbfaa8c8492a2aed5e479..3783d2accd9dbbce3d8bdf3fac9056d7897c98e4 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -70,7 +70,7 @@ function notags($string) {
 if(! function_exists('escape_tags')) {
 function escape_tags($string) {
 
-       return(htmlspecialchars($string));
+       return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false));
 }}
 
 
@@ -403,7 +403,7 @@ function load_view_file($s) {
                return file_get_contents("$d/$lang/$b");
        
        $theme = current_theme();
-       
+
        if(file_exists("$d/theme/$theme/$b"))
                return file_get_contents("$d/theme/$theme/$b");
                        
@@ -504,6 +504,10 @@ function get_tags($s) {
 
        $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
 
+       // ignore anything in a bbtag
+
+       $s = preg_replace('/\[(.*?)\]/sm','',$s);
+
        // Match full names against @tags including the space between first and last
        // We will look these up afterward to see if they are full names or not recognisable.
 
@@ -713,14 +717,49 @@ function get_poke_verbs() {
 
        $arr = array(
                'poke' => array( 'poked', t('poke'), t('poked')),
+               'ping' => array( 'pinged', t('ping'), t('pinged')),
                'prod' => array( 'prodded', t('prod'), t('prodded')),
                'slap' => array( 'slapped', t('slap'), t('slapped')),
-               'finger' => array( 'fingered', t('finger'), t('fingered'))
+               'finger' => array( 'fingered', t('finger'), t('fingered')),
+               'rebuff' => array( 'rebuffed', t('rebuff'), t('rebuffed')),
        );
        call_hooks('poke_verbs', $arr);
        return $arr;
 }
 
+function get_mood_verbs() {
+       
+       // index is present tense verb
+       // value is array containing past tense verb, translation of present, translation of past
+
+       $arr = array(
+               'happy'      => t('happy'),
+               'sad'        => t('sad'),
+               'mellow'     => t('mellow'),
+               'tired'      => t('tired'),
+               'perky'      => t('perky'),
+               'angry'      => t('angry'),
+               'stupefied'  => t('stupified'),
+               'puzzled'    => t('puzzled'),
+               'interested' => t('interested'),
+               'bitter'     => t('bitter'),
+               'cheerful'   => t('cheerful'),
+               'alive'      => t('alive'),
+               'annoyed'    => t('annoyed'),
+               'anxious'    => t('anxious'),
+               'cranky'     => t('cranky'),
+               'disturbed'  => t('disturbed'),
+               'frustrated' => t('frustrated'),
+               'motivated'  => t('motivated'),
+               'relaxed'    => t('relaxed'),
+               'surprised'  => t('surprised'),
+       );
+
+       call_hooks('mood_verbs', $arr);
+       return $arr;
+}
+
+
 /**
  * 
  * Function: smilies
@@ -1576,7 +1615,7 @@ function undo_post_tagging($s) {
 
 function fix_mce_lf($s) {
        $s = str_replace("\r\n","\n",$s);
-       $s = str_replace("\n\n","\n",$s);
+//     $s = str_replace("\n\n","\n",$s);
        return $s;
 }