diff options
| author | Friendika <info@friendika.com> | 2011-08-03 19:18:58 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-03 19:18:58 -0700 |
| commit | ad1e827169d9f57c02746b51c5268bdbe2cd8ac9 (patch) | |
| tree | a6770ab49f632a8a63f1738b05eec3de32c1ea8b /include | |
| parent | d0b7723bbcd4e9a4fd5c97370bd1c738fdcdab28 (diff) | |
| download | volse-hubzilla-ad1e827169d9f57c02746b51c5268bdbe2cd8ac9.tar.gz volse-hubzilla-ad1e827169d9f57c02746b51c5268bdbe2cd8ac9.tar.bz2 volse-hubzilla-ad1e827169d9f57c02746b51c5268bdbe2cd8ac9.zip | |
several fixes for attachments
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 11 | ||||
| -rw-r--r-- | include/items.php | 6 | ||||
| -rw-r--r-- | include/text.php | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/include/attach.php b/include/attach.php index ca53081d9..4001d2af1 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1,7 +1,7 @@ <?php -if(!function_exists('mime_content_type')) { -function mime_content_type($filename) { + +function z_mime_content_type($filename) { $mime_types = array( @@ -61,8 +61,9 @@ function mime_content_type($filename) { 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', ); - if(strpos($filename,'.') !== false) { - $ext = strtolower(array_pop(explode('.',$filename))); + $dot = strpos($filename,'.'); + if($dot !== false) { + $ext = strtolower(substr($filename,$dot+1)); if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; } @@ -76,5 +77,5 @@ function mime_content_type($filename) { else { return 'application/octet-stream'; } -}} +} diff --git a/include/items.php b/include/items.php index 6d69c6cc9..8c6134f94 100644 --- a/include/items.php +++ b/include/items.php @@ -518,7 +518,7 @@ function get_atom_elements($feed,$item) { if(! $type) $type = 'application/octet-stream'; - $att_arr[] = '[attach]href="' . $link . '" size="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]'; + $att_arr[] = '[attach]href="' . $link . '" length="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]'; } $res['attach'] = implode(',', $att_arr); } @@ -1725,11 +1725,11 @@ function item_getfeedattach($item) { if(count($arr)) { foreach($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); if($cnt) { $ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" '; if(intval($matches[2])) - $ret .= 'size="' . intval($matches[2]) . '" '; + $ret .= 'length="' . intval($matches[2]) . '" '; if($matches[4] !== ' ') $ret .= 'title="' . xmlify(trim($matches[4])) . '" '; $ret .= ' />' . "\r\n"; diff --git a/include/text.php b/include/text.php index d65c77872..a568b7a94 100644 --- a/include/text.php +++ b/include/text.php @@ -746,7 +746,7 @@ function prepare_body($item,$attach = false) { foreach($arr as $r) { $matches = false; $icon = ''; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); if($cnt) { $icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/'))); switch($icontype) { |