Merge dir into template_rework

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 5c6ab588f1ba2b4cb011bd575622eaaf5afcdb1f..4ce634b603438bab43c76dfdb0c284c7e5f71861 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -470,11 +470,17 @@ if(! function_exists('item_new_uri')) {
  * @param int $uid
  * @return string
  */
-function item_new_uri($hostname,$uid) {
+function item_new_uri($hostname,$uid, $guid = "") {
 
        do {
                $dups = false;
-               $hash = random_string();
+
+               if ($guid == "")
+                       $hash = get_guid(32);
+               else {
+                       $hash = $guid;
+                       $guid = "";
+               }
 
                $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
 
@@ -868,8 +874,14 @@ function contact_block() {
 
        if((! is_array($a->profile)) || ($a->profile['hide-friends']))
                return $o;
-       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0",
-                       intval($a->profile['uid'])
+       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
+                               AND `hidden` = 0 AND `archive` = 0
+                               AND `network` IN ('%s', '%s', '%s')",
+                       intval($a->profile['uid']),
+                       dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_OSTATUS),
+                       dbesc(NETWORK_DIASPORA)
        );
        if(count($r)) {
                $total = intval($r[0]['total']);
@@ -879,8 +891,14 @@ function contact_block() {
                $micropro = Null;
 
        } else {
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY RAND() LIMIT %d",
+               $r = q("SELECT * FROM `contact`
+                               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
+                                       AND `hidden` = 0 AND `archive` = 0
+                               AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
                                intval($a->profile['uid']),
+                               dbesc(NETWORK_DFRN),
+                               dbesc(NETWORK_OSTATUS),
+                               dbesc(NETWORK_DIASPORA),
                                intval($shown)
                );
                if(count($r)) {
@@ -952,7 +970,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        . (($click) ? ' fakelink' : '') . '" '
                        . (($redir) ? ' target="redir" ' : '')
                        . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
-                       . proxy_url($contact['micro']) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+                       . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
                        . '" /></a></div>' . "\r\n";
        }
 }}
@@ -968,16 +986,29 @@ if(! function_exists('search')) {
  * @param string $url search url
  * @param boolean $savedsearch show save search button
  */
-function search($s,$id='search-box',$url='/search',$save = false) {
+function search($s,$id='search-box',$url='/search',$save = false, $aside = true) {
        $a = get_app();
-        return replace_macros(get_markup_template('searchbox.tpl'), array(
-               '$s' => $s,
-               '$id' => $id,
-               '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
-               '$search_label' => t('Search'),
-               '$save_label' => t('Save'),
-               '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
-       ));
+
+       $values = array(
+                       '$s' => $s,
+                       '$id' => $id,
+                       '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
+                       '$search_label' => t('Search'),
+                       '$save_label' => t('Save'),
+                       '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+               );
+
+       if (!$aside) {
+               $values['$searchoption'] = array(
+                                       t("Full Text"),
+                                       t("Tags"),
+                                       t("Contacts"));
+
+               if (get_config('system','poco_local_search'))
+                       $values['$searchoption'][] = t("Forums");
+       }
+
+        return replace_macros(get_markup_template('searchbox.tpl'), $values);
 }}
 
 if(! function_exists('valid_email')) {
@@ -1379,9 +1410,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
        put_item_in_cache($item, true);
        $s = $item["rendered-html"];
 
-       require_once("mod/proxy.php");
-       $s = proxy_parse_html($s);
-
        $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
        call_hooks('prepare_body', $prep_arr);
        $s = $prep_arr['html'];
@@ -1676,11 +1704,14 @@ function get_plink($item) {
                                //'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
                                'href' => $a->get_baseurl()."/display/".$item['guid'],
                                'orig' => $a->get_baseurl()."/display/".$item['guid'],
-                               'title' => t('link to source'),
+                               'title' => t('View on separate page'),
+                               'orig_title' => t('view on separate page'),
                        );
 
-               if (x($item,'plink'))
+               if (x($item,'plink')) {
                        $ret["href"] = $item['plink'];
+                       $ret["title"] = t('link to source');
+               }
 
        } elseif (x($item,'plink') && ($item['private'] != 1))
                $ret = array(
@@ -1773,7 +1804,7 @@ function return_bytes ($size_str) {
 function generate_user_guid() {
        $found = true;
        do {
-               $guid = random_string(16);
+               $guid = get_guid(32);
                $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
                        dbesc($guid)
                );
@@ -2282,3 +2313,15 @@ function deindent($text, $chr="[\t ]", $count=NULL) {
 
        return implode("\n", $lines);
 }
+
+function formatBytes($bytes, $precision = 2) { 
+        $units = array('B', 'KB', 'MB', 'GB', 'TB'); 
+
+       $bytes = max($bytes, 0); 
+       $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); 
+       $pow = min($pow, count($units) - 1); 
+
+       $bytes /= pow(1024, $pow);
+
+       return round($bytes, $precision) . ' ' . $units[$pow]; 
+}