Merge dir into template_rework

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 285c674d7002dc6fb1dd169b0016b7cb5fd8712a..4ce634b603438bab43c76dfdb0c284c7e5f71861 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -970,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";
        }
 }}
@@ -986,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')) {
@@ -1397,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'];
@@ -1694,8 +1704,8 @@ 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('local thread'),
-                               'orig_title' => t('local thread'),
+                               'title' => t('View on separate page'),
+                               'orig_title' => t('view on separate page'),
                        );
 
                if (x($item,'plink')) {