Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-15 00:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Orange-Management/oms-Media into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-09-28 19:37:52 +02:00
commit c8757adcf6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/ApiController.php
View File

@ -22,6 +22,7 @@ use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use Modules\Media\Models\NullMediaType;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\PermissionState; use Modules\Media\Models\PermissionState;
use Modules\Media\Models\UploadFile; use Modules\Media\Models\UploadFile;
@ -42,7 +43,6 @@ use phpOMS\System\File\Local\Directory;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Views\View; use phpOMS\Views\View;
use Modules\Media\Models\NullMediaType;
/** /**
* Media class. * Media class.
@ -215,11 +215,11 @@ final class ApiController extends Controller
/** /**
* Create database entries for uploaded files * Create database entries for uploaded files
* *
* @param array $status Files * @param array $status Files
* @param int $account Uploader * @param int $account Uploader
* @param string $virtualPath Virtual path * @param string $virtualPath Virtual path
* @param null|int $type Media type (internal categorization = identifier for modules) * @param null|int $type Media type (internal categorization = identifier for modules)
* @param string $ip Ip * @param string $ip Ip
* *
* @return Media[] * @return Media[]
* *
@ -263,10 +263,10 @@ final class ApiController extends Controller
/** /**
* Create db entry for uploaded file * Create db entry for uploaded file
* *
* @param array $status Files * @param array $status Files
* @param int $account Uploader * @param int $account Uploader
* @param string $virtualPath Virtual path (not on the hard-drive) * @param string $virtualPath Virtual path (not on the hard-drive)
* @param null|int $type Media type (internal categorization) * @param null|int $type Media type (internal categorization)
* *
* @return null|Media * @return null|Media
* *