X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Ftext.php;h=2919989331f9e8775b467eda8d9487aeaef5fbec;hb=c7e1a8e871363d4e60178e30e819c3169ed406c5;hp=580bd95fc75c81343dd3e8466cc09bba9574fd35;hpb=199bba20d9daa99b368b56982e9a6b09fc19729d;p=friendica.git

diff --git a/include/text.php b/include/text.php
index 580bd95fc7..2919989331 100644
--- a/include/text.php
+++ b/include/text.php
@@ -291,8 +291,8 @@ function paginate_data(App $a, $count = null) {
 	}
 
 	$url = $stripped;
-
 	$data = array();
+
 	function _l(&$d, $name, $url, $text, $class = '') {
 		if (strpos($url, '?') === false && ($pos = strpos($url, '&')) !== false) {
 			$url = substr($url, 0, $pos) . '?' . substr($url, $pos + 1);
@@ -318,9 +318,10 @@ function paginate_data(App $a, $count = null) {
 			$numstart = 1;
 			$numstop = $numpages;
 
-			if ($numpages > 14) {
-				$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
-				$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
+			// Limit the number of displayed page number buttons.
+			if ($numpages > 8) {
+				$numstart = (($pagenum > 4) ? ($pagenum - 4) : 1);
+				$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 8));
 			}
 
 			$pages = array();
@@ -902,10 +903,10 @@ function contact_block() {
 				intval($shown)
 		);
 		if (dbm::is_result($r)) {
-			$contacts = "";
-			foreach ($r AS $contact)
+			$contacts = array();
+			foreach ($r AS $contact) {
 				$contacts[] = $contact["id"];
-
+			}
 			$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
 				dbesc(implode(",", $contacts)));
 
@@ -2124,47 +2125,48 @@ function format_network_name($network, $url = 0) {
  * @param string $lang Programming language
  * @return string Formated html
  */
-function text_highlight($s,$lang) {
-	if($lang === 'js')
+function text_highlight($s, $lang) {
+	if ($lang === 'js') {
 		$lang = 'javascript';
-
-	if(! strpos('Text_Highlighter',get_include_path())) {
-		set_include_path(get_include_path() . PATH_SEPARATOR . 'library/Text_Highlighter');
 	}
 
-	require_once('library/Text_Highlighter/Text/Highlighter.php');
-	require_once('library/Text_Highlighter/Text/Highlighter/Renderer/Html.php');
+	// @TODO: Replace Text_Highlighter_Renderer_Html by scrivo/highlight.php
+
+	// Autoload the library to make constants available
+	class_exists('Text_Highlighter_Renderer_Html');
+
 	$options = array(
 		'numbers' => HL_NUMBERS_LI,
 		'tabsize' => 4,
-		);
+	);
 
 	$tag_added = false;
-	$s = trim(html_entity_decode($s,ENT_COMPAT));
-	$s = str_replace("    ","\t",$s);
+	$s = trim(html_entity_decode($s, ENT_COMPAT));
+	$s = str_replace('    ', "\t", $s);
 
 	// The highlighter library insists on an opening php tag for php code blocks. If
 	// it isn't present, nothing is highlighted. So we're going to see if it's present.
 	// If not, we'll add it, and then quietly remove it after we get the processed output back.
 
-	if($lang === 'php') {
-		if(strpos('<?php',$s) !== 0) {
+	if ($lang === 'php') {
+		if (strpos($s, '<?php') !== 0) {
 			$s = '<?php' . "\n" . $s;
 			$tag_added = true;
 		}
 	}
 
-	$renderer = new Text_Highlighter_Renderer_HTML($options);
+	$renderer = new Text_Highlighter_Renderer_Html($options);
 	$hl = Text_Highlighter::factory($lang);
 	$hl->setRenderer($renderer);
 	$o = $hl->highlight($s);
-	$o = str_replace(["    ","\n"],["&nbsp;&nbsp;&nbsp;&nbsp;",''],$o);
+	$o = str_replace("\n", '', $o);
+
 
-	if($tag_added) {
-		$b = substr($o,0,strpos($o,'<li>'));
-		$e = substr($o,strpos($o,'</li>'));
+	if ($tag_added) {
+		$b = substr($o, 0, strpos($o, '<li>'));
+		$e = substr($o, strpos($o, '</li>'));
 		$o = $b . $e;
 	}
 
-	return('<code>' . $o . '</code>');
+	return '<code>' . $o . '</code>';
 }