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 3b0050d387a559c93fc391f59c27fc775f5b98e7..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));
 }}
 
 
@@ -280,6 +280,31 @@ function paginate(&$a) {
        return $o;
 }}
 
+if(! function_exists('alt_pager')) {
+function alt_pager(&$a, $i) {
+        $o = '';
+       $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+       $stripped = str_replace('q=','',$stripped);
+       $stripped = trim($stripped,'/');
+       $pagenum = $a->pager['page'];
+        $url = $a->get_baseurl() . '/' . $stripped;
+
+        $o .= '<div class="pager">';
+
+       if($a->pager['page']>1)
+         $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'">' . t('newer') . '</a>';
+        if($i>0) {
+          if($a->pager['page']>1)
+                 $o .= "&nbsp;-&nbsp;";
+         $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('older') . '</a>';
+       }
+
+
+        $o .= '</div>'."\r\n";
+
+       return $o;
+}}
+
 // Turn user/group ACLs stored as angle bracketed text into arrays
 
 if(! function_exists('expand_acl')) {
@@ -378,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");
                        
@@ -479,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.
 
@@ -656,6 +685,10 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 
 if(! function_exists('valid_email')) {
 function valid_email($x){
+
+       if(get_config('system','disable_email_validation'))
+               return true;
+
        if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
                return true;
        return false;
@@ -677,6 +710,55 @@ function linkify($s) {
        return($s);
 }}
 
+function get_poke_verbs() {
+       
+       // index is present tense verb
+       // value is array containing past tense verb, translation of present, translation of past
+
+       $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')),
+               '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;
+}
+
 
 /**
  * 
@@ -1533,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;
 }