Page MenuHomePhorge
Files F2533720

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/api/file_create.php b/lib/api/file_create.php
index 5b163a7..1c50387 100644
--- a/lib/api/file_create.php
+++ b/lib/api/file_create.php
@@ -1,71 +1,82 @@
<?php
/*
+--------------------------------------------------------------------------+
| This file is part of the Kolab File API |
| |
| Copyright (C) 2012-2014, Kolab Systems AG |
| |
| This program is free software: you can redistribute it and/or modify |
| it under the terms of the GNU Affero General Public License as published |
| by the Free Software Foundation, either version 3 of the License, or |
| (at your option) any later version. |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public License |
| along with this program. If not, see <http://www.gnu.org/licenses/> |
+--------------------------------------------------------------------------+
| Author: Aleksander Machniak <machniak@kolabsys.com> |
+--------------------------------------------------------------------------+
*/
class file_api_file_create extends file_api_common
{
/**
* Request handler
*/
public function handle()
{
parent::handle();
if (!isset($this->args['file']) || $this->args['file'] === '') {
throw new Exception("Missing file name", file_api_core::ERROR_CODE);
}
if (!isset($this->args['content'])) {
if (!($this->api instanceof file_api_lib) || empty($this->args['path'])) {
throw new Exception("Missing file content", file_api_core::ERROR_CODE);
}
}
if (is_resource($this->args['content'])) {
$chunk = stream_get_contents($this->args['content'], 1024000, 0);
}
else if ($this->args['path']) {
$chunk = $this->args['path'];
$is_file = true;
}
else {
$chunk = $this->args['content'];
}
+ $ctype = $this->args['content-type'];
+ if ($ctype && !preg_match('/^[a-z_-]+\/[a-z._-]+$/', $ctype)) {
+ $ctype = '';
+ }
+
$request = $this instanceof file_api_file_update ? 'file_update' : 'file_create';
$file = array(
'content' => $this->args['content'],
'path' => $this->args['path'],
- 'type' => rcube_mime::file_content_type($chunk,
- $this->args['file'], $this->args['content-type'], !$is_file),
+ 'type' => rcube_mime::file_content_type($chunk, $this->args['file'], $ctype, !$is_file),
);
+ if (strpos($file['type'], 'empty') !== false && $ctype) {
+ $file['type'] = $ctype;
+ }
+ else if (empty($file['type'])) {
+ $file['type'] = 'application/octet-stream';
+ }
+
list($driver, $path) = $this->api->get_driver($this->args['file']);
$driver->$request($path, $file);
if (rcube_utils::get_boolean((string) $this->args['info'])) {
return $driver->file_info($path);
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Feb 5, 9:47 PM (6 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
427997
Default Alt Text
(3 KB)

Event Timeline