Merge pull request #605 from fermionic/20130204-events-request-too-many-dates

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 1d74d9cf5c4bc19df856707acf6f30cd1bd0adc6..c7fb7a67d657376e3cd2469a7fc8f6dac23392cd 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -23,7 +23,6 @@ function replace_macros($s,$r) {
                if(gettype($s) === 'string') {
                        $template = $s;
                        $s = new FriendicaSmarty();
-                       $s->error_reporting = E_ALL & ~E_NOTICE;
                }
                foreach($r as $key=>$value) {
                        if($key[0] === '$') {
@@ -490,12 +489,12 @@ function get_template_file($a, $filename, $root = '') {
        if($root !== '' && $root[strlen($root)-1] !== '/')
                $root = $root . '/';
 
-       if(file_exists($root . "view/theme/$theme/$filename"))
-               $template_file = $root . "view/theme/$theme/$filename";
-       elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename"))
-               $template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename";
+       if(file_exists("{$root}view/theme/$theme/$filename"))
+               $template_file = "{$root}view/theme/$theme/$filename";
+       elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
+               $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
        else
-               $template_file = $root . "view/$filename";
+               $template_file = "{$root}view/$filename";
 
        return $template_file;
 }}
@@ -1042,16 +1041,27 @@ function prepare_body($item,$attach = false) {
                return $s;
        }
 
-       $arr = explode(',',$item['attach']);
+       $arr = explode('[/attach],',$item['attach']);
        if(count($arr)) {
                $s .= '<div class="body-attach">';
                foreach($arr as $r) {
                        $matches = false;
                        $icon = '';
-                       $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
+                       $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
                        if($cnt) {
                                foreach($matches as $mtch) {
-                                       $icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
+                                       $filetype = strtolower(substr( $mtch[3], 0, strpos($mtch[3],'/') ));
+                                       if($filetype) {
+                                               $filesubtype = strtolower(substr( $mtch[3], strpos($mtch[3],'/') + 1 ));
+                                               $filesubtype = str_replace('.', '-', $filesubtype);
+                                       }
+                                       else {
+                                               $filetype = 'unkn';
+                                               $filesubtype = 'unkn';
+                                       }
+
+                                       $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
+                                       /*$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
                                        switch($icontype) {
                                                case 'video':
                                                case 'audio':
@@ -1062,7 +1072,8 @@ function prepare_body($item,$attach = false) {
                                                default:
                                                        $icon = '<div class="attachtype icon s22 type-unkn"></div>';
                                                        break;
-                                       }
+                                       }*/
+
                                        $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
                                        $title .= ' ' . $mtch[2] . ' ' . t('bytes');
                                        if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))