Removed test logger

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index f77f81e7d7f70c5165e9b6eacdc3a9a7663454fb..8ce54b3c6786c130a6c93e5e72402e855946418b 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -270,23 +270,23 @@ if(! function_exists('paginate_data')) {
  * @return Array data for pagination template
  */
 function paginate_data(&$a, $count=null) {
-       $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+       $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
 
        $stripped = str_replace('q=','',$stripped);
        $stripped = trim($stripped,'/');
        $pagenum = $a->pager['page'];
 
-       if (($a->page_offset != "") AND !strstr($stripped, "&offset="))
+       if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
                $stripped .= "&offset=".urlencode($a->page_offset);
-       if (!strpos($stripped, "?")) {
-               if ($pos = strpos($stripped, "&"))
-                       $stripped = substr($stripped, 0, $pos)."?".substr($stripped, $pos + 1);
-       }
 
        $url = $a->get_baseurl() . '/' . $stripped;
 
        $data = array();
        function _l(&$d, $name, $url, $text, $class="") {
+               if (!strpos($url, "?")) {
+                       if ($pos = strpos($url, "&"))
+                               $url = substr($url, 0, $pos)."?".substr($url, $pos + 1);
+               }
 
                $d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
        }
@@ -385,6 +385,18 @@ function alt_pager(&$a, $i) {
 
 }}
 
+if(! function_exists('scroll_loader')) {
+/**
+ * Loader for infinite scrolling
+ * @return string html for loader
+ */
+function scroll_loader() {
+       $tpl = get_markup_template("scroll_loader.tpl");
+       return replace_macros($tpl, array(
+               'wait' => t('Loading more entries...'),
+               'end' => t('The end')
+       ));
+}}
 
 if(! function_exists('expand_acl')) {
 /**
@@ -740,6 +752,9 @@ if(! function_exists('get_tags')) {
 function get_tags($s) {
        $ret = array();
 
+       // Convert hashtag links to hashtags
+       $s = preg_replace("/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism", "#$2", $s);
+
        // ignore anything in a code block
        $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
 
@@ -1281,6 +1296,28 @@ function redir_private_images($a, &$item) {
 
 }}
 
+function put_item_in_cache(&$item, $update = false) {
+
+       if (($item["rendered-hash"] != hash("md5", $item["body"])) OR ($item["rendered-hash"] == "") OR
+               ($item["rendered-html"] == "") OR get_config("system", "ignore_cache")) {
+
+               // The function "redir_private_images" changes the body.
+               // I'm not sure if we should store it permanently, so we save the old value.
+               $body = $item["body"];
+
+               $a = get_app();
+               redir_private_images($a, $item);
+
+               $item["rendered-html"] = prepare_text($item["body"]);
+               $item["rendered-hash"] = hash("md5", $item["body"]);
+               $item["body"] = $body;
+
+               if ($update AND ($item["id"] != 0)) {
+                       q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
+                               dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"]));
+               }
+       }
+}
 
 // Given an item array, convert the body element from bbcode to html and add smilie icons.
 // If attach is true, also add icons for item attachments
@@ -1332,28 +1369,8 @@ function prepare_body(&$item,$attach = false, $preview = false) {
        $item['hashtags'] = $hashtags;
        $item['mentions'] = $mentions;
 
-
-       $cachefile = get_cachefile(urlencode($item["guid"])."-".hash("md5", $item['body']));
-
-       if (($cachefile != '')) {
-               if (file_exists($cachefile)) {
-                       $stamp1 = microtime(true);
-                       $s = file_get_contents($cachefile);
-                       $a->save_timestamp($stamp1, "file");
-               } else {
-                       redir_private_images($a, $item);
-                       $s = prepare_text($item['body']);
-
-                       $stamp1 = microtime(true);
-                       file_put_contents($cachefile, $s);
-                       $a->save_timestamp($stamp1, "file");
-
-                       logger('prepare_body: put item '.$item["id"].' into cachefile '.$cachefile);
-               }
-       } else {
-               redir_private_images($a, $item);
-               $s = prepare_text($item['body']);
-       }
+       put_item_in_cache($item, true);
+       $s = $item["rendered-html"];
 
        require_once("mod/proxy.php");
        $s = proxy_parse_html($s);