removed to-do

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index e174aa37532e4198e1b87f71a6bce54ff0fb79f3..f77a4dec2ce71cf489daf63e8964c89f36884575 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -276,7 +276,7 @@ if(! function_exists('paginate_data')) {
  * @param int $count [optional] item count (used with alt pager)
  * @return Array data for pagination template
  */
-function paginate_data(&$a, $count=null) {
+function paginate_data(App $a, $count=null) {
        $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
 
        $stripped = str_replace('q=','',$stripped);
@@ -369,7 +369,7 @@ if(! function_exists('paginate')) {
  * @param App $a App instance
  * @return string html for pagination #FIXME remove html
  */
-function paginate(&$a) {
+function paginate(App $a) {
 
        $data = paginate_data($a);
        $tpl = get_markup_template("paginate.tpl");
@@ -384,7 +384,7 @@ if(! function_exists('alt_pager')) {
  * @param int $i
  * @return string html for pagination #FIXME remove html
  */
-function alt_pager(&$a, $i) {
+function alt_pager(App $a, $i) {
 
        $data = paginate_data($a, $i);
        $tpl = get_markup_template("paginate.tpl");
@@ -912,7 +912,7 @@ function contact_block() {
                        if (dbm::is_result($r)) {
                                $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
                                $micropro = Array();
-                               foreach($r as $rr) {
+                               foreach ($r as $rr) {
                                        $micropro[] = micropro($rr,true,'mpfriend');
                                }
                        }
@@ -1717,7 +1717,7 @@ function bb_translate_video($s) {
 
        $matches = null;
        $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
-       if($r) {
+       if ($r) {
                foreach($matches as $mtch) {
                        if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
                                $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);
@@ -2045,13 +2045,6 @@ 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;
-}
-
-
 function protect_sprintf($s) {
        return(str_replace('%','%%',$s));
 }
@@ -2073,17 +2066,19 @@ function is_a_date_arg($s) {
 /**
  * remove intentation from a text
  */
-function deindent($text, $chr="[\t ]", $count=NULL) {
-       $text = fix_mce_lf($text);
+function deindent($text, $chr = "[\t ]", $count = NULL) {
        $lines = explode("\n", $text);
        if (is_null($count)) {
                $m = array();
-               $k=0; while($k<count($lines) && strlen($lines[$k])==0) $k++;
-               preg_match("|^".$chr."*|", $lines[$k], $m);
+               $k = 0;
+               while ($k < count($lines) && strlen($lines[$k]) == 0) {
+                       $k++;
+               }
+               preg_match("|^" . $chr . "*|", $lines[$k], $m);
                $count = strlen($m[0]);
        }
-       for ($k=0; $k<count($lines); $k++){
-               $lines[$k] = preg_replace("|^".$chr."{".$count."}|", "", $lines[$k]);
+       for ($k=0; $k < count($lines); $k++) {
+               $lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
        }
 
        return implode("\n", $lines);