Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-11 19:06:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Added mime type file checking instead of extension. Thanks to @vmario89 for the feedback. Related #825

Browse Source 
* [MOD] Improved exception handling in controllers

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-11-10 21:41:07 +01:00
parent a159569e74
commit ed956eec54
53 changed files with 924 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/modules/web/Controllers/ConfigManagerController.php
View File

@@ -29,6 +29,7 @@ use SP\Core\AppInfoInterface;
use SP\Core\Crypt\CryptSessionHandler;
use SP\Core\Events\Event;
use SP\Core\Language;
use SP\Core\MimeTypes;
use SP\Modules\Web\Controllers\Helpers\TabsHelper;
use SP\Mvc\View\Components\DataTab;
use SP\Mvc\View\Components\SelectItemAdapter;
@@ -162,7 +163,10 @@ final class ConfigManagerController extends ControllerBase
/**
* @return DataTab
* @throws \DI\DependencyException
* @throws \DI\NotFoundException
* @throws \SP\Core\Exceptions\CheckException
* @throws \SP\Core\Exceptions\SPException
*/
protected function getAccountConfig()
{
@@ -171,6 +175,19 @@ final class ConfigManagerController extends ControllerBase
$template->addTemplate('accounts');
$template->assign('gdIsAvailable', $this->extensionChecker->checkGdAvailable());
$mimeTypesAvailable = array_map(function ($value) {
return $value['type'];
}, $this->dic->get(MimeTypes::class)->getMimeTypes());
$mimeTypes = SelectItemAdapter::factory(
array_merge($mimeTypesAvailable, $this->configData->getFilesAllowedMime())
);
$template->assign('mimeTypes', $mimeTypes->getItemsFromArraySelected(
$this->configData->getFilesAllowedMime(),
true)
);
return new DataTab(__('Accounts'), $template);
}
@@ -263,7 +280,9 @@ final class ConfigManagerController extends ControllerBase
$template->assign('tempMasterPassTime', $configService->getByParam(TemporaryMasterPassService::PARAM_TIME, 0));
$template->assign('tempMasterMaxTime', $configService->getByParam(TemporaryMasterPassService::PARAM_MAX_TIME, 0));
$tempMasterAttempts = sprintf('%d/%d', $configService->getByParam(TemporaryMasterPassService::PARAM_ATTEMPTS, 0), TemporaryMasterPassService::MAX_ATTEMPTS);
$tempMasterAttempts = sprintf('%d/%d',
$configService->getByParam(TemporaryMasterPassService::PARAM_ATTEMPTS, 0),
TemporaryMasterPassService::MAX_ATTEMPTS);
$template->assign('tempMasterAttempts', $tempMasterAttempts);
$template->assign('tempMasterPass', $this->session->getTemporaryMasterPass());
@@ -325,8 +344,14 @@ final class ConfigManagerController extends ControllerBase
$template->setBase('config');
$template->addTemplate('import');
$template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModelSelected([$this->userData->getUserGroupId()]));
$template->assign('users', SelectItemAdapter::factory(UserService::getItemsBasic())->getItemsFromModelSelected([$this->userData->getId()]));
$template->assign('userGroups', SelectItemAdapter::factory(
UserGroupService::getItemsBasic())
->getItemsFromModelSelected([$this->userData->getUserGroupId()])
);
$template->assign('users', SelectItemAdapter::factory(
UserService::getItemsBasic())
->getItemsFromModelSelected([$this->userData->getId()])
);
return new DataTab(__('Import Accounts'), $template);
}