Merge pull request #247 from simonlnu/master

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 5456b5ad3e5a1248d5b6572a3a2bf114b8dfbc0d..8c8db66a9eee938f90be5b1b476d9b3503003ec2 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -80,6 +80,9 @@ function escape_tags($string) {
 if(! function_exists('autoname')) {
 function autoname($len) {
 
+       if($len <= 0)
+               return '';
+
        $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); 
        if(mt_rand(0,5) == 4)
                $vowels[] = 'y';
@@ -1065,10 +1068,12 @@ function unamp($s) {
 if(! function_exists('lang_selector')) {
 function lang_selector() {
        global $lang;
-       $o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
-       $o .= '<div id="language-selector" style="display: none;" >';
-       $o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >';
+       
        $langs = glob('view/*/strings.php');
+       
+       $lang_options = array();
+       $selected = "";
+       
        if(is_array($langs) && count($langs)) {
                $langs[] = '';
                if(! in_array('view/en/strings.php',$langs))
@@ -1076,17 +1081,22 @@ function lang_selector() {
                asort($langs);
                foreach($langs as $l) {
                        if($l == '') {
-                               $default_selected = ((! x($_SESSION,'language')) ? ' selected="selected" ' : '');
-                               $o .= '<option value="" ' . $default_selected . '>' . t('default') . '</option>';
+                               $lang_options[""] = t('default');
                                continue;
                        }
                        $ll = substr($l,5);
                        $ll = substr($ll,0,strrpos($ll,'/'));
-                       $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : '');
-                       $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
+                       $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected);
+                       $lang_options[$ll]=$ll;
                }
        }
-       $o .= '</select></form></div>';
+
+       $tpl = get_markup_template("lang_selector.tpl");        
+       $o = replace_macros($tpl, array(
+               '$title' => t('Select an alternate language'),
+               '$langs' => array($lang_options, $selected),
+               
+       ));
        return $o;
 }}
 
@@ -1503,3 +1513,8 @@ function undo_post_tagging($s) {
        return $s;
 }
 
+function fix_mce_lf($s) {
+       $s = str_replace("\r\n","\n",$s);
+       $s = str_replace("\n\n","\n",$s);
+       return $s;
+}