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

* [MOD] Config module. Work in progress

Browse Source 
* [MOD] Improved import module. Work in progress
This commit is contained in:
nuxsmin
2018-02-20 01:31:32 +01:00
parent af02a59218
commit 62a4b388cb
30 changed files with 1258 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/SP/Controller/ConfigActionController.php
View File

@@ -26,8 +26,6 @@ namespace SP\Controller;
use SP\Account\AccountCrypt;
use SP\Account\AccountHistoryCrypt;
use SP\Config\Config;
use SP\Config\ConfigData;
use SP\Config\ConfigDB;
use SP\Core\ActionsInterface;
use SP\Core\Backup;
@@ -43,15 +41,14 @@ use SP\Core\TaskFactory;
use SP\Core\Traits\InjectableTrait;
use SP\Core\XmlExport;
use SP\Http\Request;
use SP\Import\Import;
use SP\Import\ImportParams;
use SP\Log\Email;
use SP\Log\Log;
use SP\Mgmt\CustomFields\CustomFieldsUtil;
use SP\Mgmt\Users\UserPass;
use SP\Mgmt\Users\UserUtil;
use SP\Services\Import\ImportParams;
use SP\Services\Import\ImportService;
use SP\Storage\DbWrapper;
use SP\Util\Checks;
use SP\Util\Json;
use SP\Util\Util;
@@ -710,7 +707,7 @@ class ConfigActionController implements ItemControllerInterface
$ImportParams->setImportMasterPwd(Request::analyzeEncrypted('importMasterPwd'));
$ImportParams->setCsvDelimiter(Request::analyze('csvDelimiter'));
$Import = new Import($ImportParams);
$Import = new ImportService($ImportParams);
$LogMessage = $Import->doImport($_FILES['inFile']);
$this->JsonResponse->setDescription($LogMessage->getHtmlDescription(true));