diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-01-22 09:29:13 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-01-22 09:29:13 -0800 |
| commit | 660ed058bf719a4545c569712a0b9244f127cc18 (patch) | |
| tree | cfd32f1b00dfb104d6ea33aaf79fb61a1c0c1ee7 | |
| parent | 9d9be768c53bebbc8e339704d74b3e6e78700d5a (diff) | |
| parent | d94114ec986ba1440b74d41bec8896db186f8eb2 (diff) | |
| download | volse-hubzilla-660ed058bf719a4545c569712a0b9244f127cc18.tar.gz volse-hubzilla-660ed058bf719a4545c569712a0b9244f127cc18.tar.bz2 volse-hubzilla-660ed058bf719a4545c569712a0b9244f127cc18.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 7 | ||||
| -rw-r--r-- | include/attach.php | 21 |
2 files changed, 26 insertions, 2 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index 93a546086..5642c3f86 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -378,11 +378,14 @@ class RedBrowser extends DAV\Browser\Plugin { 'audio/mpeg' => 'icon-music', 'audio/wav' => 'icon-music', 'application/ogg' => 'icon-music', + 'audio/ogg' => 'icon-music', + 'audio/webm' => 'icon-music', + 'audio/mp4' => 'icon-music', //Video 'video/quicktime' => 'icon-film', - - + 'video/webm' => 'icon-film', + 'video/mp4' => 'icon-film' ); $iconFromType = 'icon-file-alt'; diff --git a/include/attach.php b/include/attach.php index a6757744f..c66ba40d5 100644 --- a/include/attach.php +++ b/include/attach.php @@ -64,6 +64,11 @@ function z_mime_content_type($filename) { 'qt' => 'video/quicktime', 'mov' => 'video/quicktime', 'ogg' => 'application/ogg', + 'opus' => 'audio/ogg', + 'webm' => 'audio/webm', + 'webm' => 'video/webm', + 'mp4' => 'audio/mp4', + 'mp4' => 'video/mp4', // adobe 'pdf' => 'application/pdf', @@ -81,6 +86,22 @@ function z_mime_content_type($filename) { // open office 'odt' => 'application/vnd.oasis.opendocument.text', 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odb' => 'application/vnd.oasis.opendocument.base', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'otf' => 'application/vnd.oasis.opendocument.formula-template', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web' ); $dot = strpos($filename, '.'); |