Improve whitespace display from/to BBCode/HTML

[friendica.git/.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index aee0a70..97baee7 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -12,6 +12,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -20,8 +21,8 @@ use Friendica\Model\Item;
 use Friendica\Render\FriendicaSmarty;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\Proxy as ProxyUtils;
 
-require_once "mod/proxy.php";
 require_once "include/conversation.php";
 
 /**
@@ -755,9 +756,9 @@ function contact_block() {
                                AND NOT `pending` AND NOT `hidden` AND NOT `archive`
                                AND `network` IN ('%s', '%s', '%s')",
                        intval($a->profile['uid']),
-                       DBA::escape(NETWORK_DFRN),
-                       DBA::escape(NETWORK_OSTATUS),
-                       DBA::escape(NETWORK_DIASPORA)
+                       DBA::escape(Protocol::DFRN),
+                       DBA::escape(Protocol::OSTATUS),
+                       DBA::escape(Protocol::DIASPORA)
        );
        if (DBA::isResult($r)) {
                $total = intval($r[0]['total']);
@@ -773,9 +774,9 @@ function contact_block() {
                                        AND `network` IN ('%s', '%s', '%s')
                                ORDER BY RAND() LIMIT %d",
                                intval($a->profile['uid']),
-                               DBA::escape(NETWORK_DFRN),
-                               DBA::escape(NETWORK_OSTATUS),
-                               DBA::escape(NETWORK_DIASPORA),
+                               DBA::escape(Protocol::DFRN),
+                               DBA::escape(Protocol::OSTATUS),
+                               DBA::escape(Protocol::DIASPORA),
                                intval($shown)
                );
                if (DBA::isResult($r)) {
@@ -858,7 +859,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                '$click' => defaults($contact, 'click', ''),
                '$class' => $class,
                '$url' => $url,
-               '$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+               '$photo' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                '$name' => $contact['name'],
                'title' => $contact['name'] . ' [' . $contact['addr'] . ']',
                '$parkle' => $sparkle,
@@ -1039,7 +1040,7 @@ function redir_private_images($a, &$item)
                                continue;
                        }
 
-                       if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
+                       if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == Protocol::DFRN)) {
                                $img_url = 'redir?f=1&quiet=1&url=' . urlencode($mtch[1]) . '&conurl=' . urlencode($item['author-link']);
                                $item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
                        }
@@ -1458,26 +1459,6 @@ function return_bytes($size_str) {
        }
 }
 
-
-/**
- * @return string
- */
-function generate_user_guid() {
-       $found = true;
-       do {
-               $guid = System::createGUID(32);
-               $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
-                       DBA::escape($guid)
-               );
-               if (!DBA::isResult($x)) {
-                       $found = false;
-               }
-       } while ($found == true);
-
-       return $guid;
-}
-
-
 /**
  * @param string $s
  * @param boolean $strip_padding
@@ -1930,58 +1911,3 @@ function format_network_name($network, $url = 0) {
                return $network_name;
        }
 }
-
-/**
- * @brief Syntax based code highlighting for popular languages.
- * @param string $s Code block
- * @param string $lang Programming language
- * @return string Formated html
- */
-function text_highlight($s, $lang) {
-       if ($lang === 'js') {
-               $lang = 'javascript';
-       }
-
-       if ($lang === 'bash') {
-               $lang = 'sh';
-       }
-
-       // @TODO: Replace Text_Highlighter_Renderer_Html by scrivo/highlight.php
-
-       // Autoload the library to make constants available
-       class_exists('Text_Highlighter_Renderer_Html');
-
-       $options = [
-               'numbers' => HL_NUMBERS_LI,
-               'tabsize' => 4,
-       ];
-
-       $tag_added = false;
-       $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' && strpos($s, '<?php') !== 0) {
-               $s = '<?php' . "\n" . $s;
-               $tag_added = true;
-       }
-
-       $renderer = new Text_Highlighter_Renderer_Html($options);
-       $factory = new Text_Highlighter();
-       $hl = $factory->factory($lang);
-       $hl->setRenderer($renderer);
-       $o = $hl->highlight($s);
-       $o = str_replace("\n", '', $o);
-
-       if ($tag_added) {
-               $b = substr($o, 0, strpos($o, '<li>'));
-               $e = substr($o, strpos($o, '</li>'));
-               $o = $b . $e;
-       }
-
-       return '<code>' . $o . '</code>';
-}