Merge branch '1.6.x' of github.com:appwrite/appwrite into 1.6.x

This commit is contained in:
shimon 2025-01-26 09:44:21 +02:00
commit 7dbb2ce63e
3 changed files with 68 additions and 65 deletions

View file

@ -1,8 +1,10 @@
<?php <?php
return [ // Accepted inputs files return [
'jpg' => 'image/jpeg', // Accepted inputs files
'jpeg' => 'image/jpeg', "jpg" => "image/jpeg",
'gif' => 'image/gif', "jpeg" => "image/jpeg",
'png' => 'image/png', "gif" => "image/gif",
"png" => "image/png",
"heic" => "image/heic",
]; ];

View file

@ -1,70 +1,71 @@
<?php <?php
return [ return [
'image/jpeg', "image/jpeg",
'image/jpeg', "image/jpeg",
'image/gif', "image/gif",
'image/png', "image/png",
'image/webp', "image/webp",
// 'image/heic', "image/heic",
'image/avif', "image/heic-sequence",
"image/avif",
// Video Files // Video Files
'video/mp4', "video/mp4",
'video/x-flv', "video/x-flv",
'video/webm', "video/webm",
'application/x-mpegURL', "application/x-mpegURL",
'video/MP2T', "video/MP2T",
'video/3gpp', "video/3gpp",
'video/quicktime', "video/quicktime",
'video/x-msvideo', "video/x-msvideo",
'video/x-ms-wmv', "video/x-ms-wmv",
// Audio Files // Audio Files
'audio/basic', // au snd RFC 2046 "audio/basic", // au snd RFC 2046
'auido/L24', // Linear PCM RFC 3190 "auido/L24", // Linear PCM RFC 3190
'audio/mid', // mid rmi "audio/mid", // mid rmi
'audio/mpeg', // mp3 RFC 3003 "audio/mpeg", // mp3 RFC 3003
'audio/mp4', // mp4 audio "audio/mp4", // mp4 audio
'audio/x-aiff', // aif aifc aiff "audio/x-aiff", // aif aifc aiff
'audio/x-mpegurl', // m3u "audio/x-mpegurl", // m3u
'audio/vnd.rn-realaudio', // ra ram "audio/vnd.rn-realaudio", // ra ram
'audio/ogg', // Ogg Vorbis RFC 5334 "audio/ogg", // Ogg Vorbis RFC 5334
'audio/vorbis', // Vorbis RFC 5215 "audio/vorbis", // Vorbis RFC 5215
'audio/vnd.wav', // wav RFC 2361 "audio/vnd.wav", // wav RFC 2361
'audio/x-wav', // php reads .wav as this - https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types "audio/x-wav", // php reads .wav as this - https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
'audio/aac', //AAC audio "audio/aac", //AAC audio
'audio/x-hx-aac-adts', // AAC audio "audio/x-hx-aac-adts", // AAC audio
// Microsoft Word // Microsoft Word
'application/msword', "application/msword",
'application/vnd.openxmlformats-officedocument.wordprocessingml.document', "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
'application/vnd.openxmlformats-officedocument.wordprocessingml.template', "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
'application/vnd.ms-word.document.macroEnabled.12', "application/vnd.ms-word.document.macroEnabled.12",
// Microsoft Excel // Microsoft Excel
'application/vnd.ms-excel', "application/vnd.ms-excel",
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
'application/vnd.openxmlformats-officedocument.spreadsheetml.template', "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
'application/vnd.ms-excel.sheet.macroEnabled.12', "application/vnd.ms-excel.sheet.macroEnabled.12",
'application/vnd.ms-excel.template.macroEnabled.12', "application/vnd.ms-excel.template.macroEnabled.12",
'application/vnd.ms-excel.addin.macroEnabled.12', "application/vnd.ms-excel.addin.macroEnabled.12",
'application/vnd.ms-excel.sheet.binary.macroEnabled.12', "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
// Microsoft Power Point // Microsoft Power Point
'application/vnd.ms-powerpoint', "application/vnd.ms-powerpoint",
'application/vnd.openxmlformats-officedocument.presentationml.presentation', "application/vnd.openxmlformats-officedocument.presentationml.presentation",
'application/vnd.openxmlformats-officedocument.presentationml.template', "application/vnd.openxmlformats-officedocument.presentationml.template",
'application/vnd.openxmlformats-officedocument.presentationml.slideshow', "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
'application/vnd.ms-powerpoint.addin.macroEnabled.12', "application/vnd.ms-powerpoint.addin.macroEnabled.12",
'application/vnd.ms-powerpoint.presentation.macroEnabled.12', "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
'application/vnd.ms-powerpoint.template.macroEnabled.12', "application/vnd.ms-powerpoint.template.macroEnabled.12",
'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
// Microsoft Access // Microsoft Access
'application/vnd.ms-access', "application/vnd.ms-access",
// Adobe PDF // Adobe PDF
'application/pdf', "application/pdf",
]; ];

View file

@ -1,12 +1,12 @@
<?php <?php
return [ // Accepted outputs files return [
'jpg' => 'image/jpeg', // Accepted outputs files
'jpeg' => 'image/jpeg', "jpg" => "image/jpeg",
'gif' => 'image/gif', "jpeg" => "image/jpeg",
'png' => 'image/png', "gif" => "image/gif",
'webp' => 'image/webp', "png" => "image/png",
// 'heic' => 'image/heic', "webp" => "image/webp",
// 'heics' => 'image/heic', "heic" => "image/heic",
'avif' => 'image/avif' "avif" => "image/avif",
]; ];