update to v4.0.0; point to local host of SWF

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 628b4fc2daaa4be33ba7997863275b888d1ad6d1..7b27d8b86e7a819020871c9f312fdb5f236b07e5 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -570,28 +570,6 @@ function get_markup_template($s, $root = '') {
        $a->save_timestamp($stamp1, "file");
        
        return $template;
-       /*
-
-       if($a->theme['template_engine'] === 'smarty3') {
-               $template_file = get_template_file($a, 'smarty3/' . $s, $root);
-
-               $template = new FriendicaSmarty();
-               $template->filename = $template_file;
-               $a->save_timestamp($stamp1, "rendering");
-
-               return $template;
-       }
-       else {
-               $template_file = get_template_file($a, $s, $root);
-               $a->save_timestamp($stamp1, "rendering");
-
-               $stamp1 = microtime(true);
-               $content = file_get_contents($template_file);
-               $a->save_timestamp($stamp1, "file");
-               return $content;
-
-       }
-        */
 }}
 
 if(! function_exists("get_template_file")) {
@@ -613,6 +591,8 @@ function get_template_file($a, $filename, $root = '') {
                $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";
+       elseif (file_exists("{$root}/$filename"))
+               $template_file = "{$root}/$filename";
        else
                $template_file = "{$root}view/$filename";
 
@@ -1305,18 +1285,49 @@ function prepare_body($item,$attach = false) {
                return $s;
        }
 
+       $as = '';
+       $vhead = false;
        $arr = explode('[/attach],',$item['attach']);
        if(count($arr)) {
-               $s .= '<div class="body-attach">';
+               $as .= '<div class="body-attach">';
                foreach($arr as $r) {
                        $matches = false;
                        $icon = '';
                        $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
                        if($cnt) {
                                foreach($matches as $mtch) {
-                                       $filetype = strtolower(substr( $mtch[3], 0, strpos($mtch[3],'/') ));
+                                       $mime = $mtch[3];
+
+                                       if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
+                                               $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+                                       else
+                                               $the_url = $mtch[1];
+
+                                       if(strpos($mime, 'video') !== false) {
+                                               if(!$vhead) {
+                                                       $vhead = true;
+                                                       $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
+                                                               '$baseurl' => $a->get_baseurl(),
+                                                       ));
+                                                       $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
+                                                               '$baseurl' => $a->get_baseurl(),
+                                                       ));
+                                               }
+
+                                               $id = end(explode('/', $the_url));
+                                               $as .= replace_macros(get_markup_template('video_top.tpl'), array(
+                                                       '$video'        => array(
+                                                               'id'       => $id,
+                                                               'title'         => t('View Video'),
+                                                               'src'           => $the_url,
+                                                               'mime'          => $mime,
+                                                       ),
+                                               ));
+                                       }
+
+                                       $filetype = strtolower(substr( $mime, 0, strpos($mime,'/') ));
                                        if($filetype) {
-                                               $filesubtype = strtolower(substr( $mtch[3], strpos($mtch[3],'/') + 1 ));
+                                               $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
                                                $filesubtype = str_replace('.', '-', $filesubtype);
                                        }
                                        else {
@@ -1340,17 +1351,14 @@ function prepare_body($item,$attach = false) {
 
                                        $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))
-                                               $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
-                                       else
-                                               $the_url = $mtch[1];
 
-                                       $s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
+                                       $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
                                }
                        }
                }
-               $s .= '<div class="clear"></div></div>';
+               $as .= '<div class="clear"></div></div>';
        }
+       $s = $s . $as;
 
 
        // Look for spoiler