X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=f77a4dec2ce71cf489daf63e8964c89f36884575;hb=40390cc5ece7f9a1e723dca19946b86fcac46a77;hp=5856226c3725ea3eac596c69bbf781afce18d8b7;hpb=ff569756ee6c5e058700cf6428918f059525e77c;p=friendica.git diff --git a/include/text.php b/include/text.php index 5856226c37..f77a4dec2c 100644 --- a/include/text.php +++ b/include/text.php @@ -23,7 +23,7 @@ function replace_macros($s,$r) { $a = get_app(); // pass $baseurl to all templates - $r['$baseurl'] = $a->get_baseurl(); + $r['$baseurl'] = App::get_baseurl(); $t = $a->template_engine(); @@ -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'); } } @@ -1367,7 +1367,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { // map if(strpos($s,'
') !== false && $item['coord']) { $x = generate_map(trim($item['coord'])); - if($x) { + if ($x) { $s = preg_replace('/\
/','$0' . $x,$s); } } @@ -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); @@ -2000,8 +2000,9 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { intval($item), intval($uid) ); - if(! dbm::is_result($r)) + if (! dbm::is_result($r)) { return false; + } q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc(str_replace($pattern,'',$r[0]['file'])), @@ -2020,11 +2021,11 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')), //); - if(! dbm::is_result($r)) { + if (! dbm::is_result($r)) { $saved = get_pconfig($uid,'system','filetags'); set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved)); - } + return true; } @@ -2044,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)); } @@ -2072,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