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

* [ADD] Unit testing. Work in progress

Browse Source 
* [MOD] Code refactoring
* [FIX] Minor bugfixes
This commit is contained in:
nuxsmin
2018-08-06 10:16:29 +02:00
parent 218a481732
commit a00b1fb3e9
63 changed files with 1188 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/modules/web/Controllers/ResourceController.php
View File

@@ -40,26 +40,21 @@ final class ResourceController extends SimpleControllerBase
protected $minify;
/**
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
* @throws SPException
* Returns CSS resources
*/
public function cssAction()
{
$this->request->verifySignature($this->configData->getPasswordSalt());
$file = $this->request->analyzeString('f');
$base = $this->request->analyzeString('b');
$minify = $this->dic->get(Minify::class);
if ($file && $base) {
$minify->setType(Minify::FILETYPE_CSS)
$this->minify
->setType(Minify::FILETYPE_CSS)
->setBase(urldecode($base), true)
->addFilesFromString(urldecode($file))
->getMinified();
} else {
$minify->setType(Minify::FILETYPE_CSS)
$this->minify->setType(Minify::FILETYPE_CSS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'css')
->addFiles(['reset.min.css',
'jquery-ui.min.css',
@@ -74,32 +69,27 @@ final class ResourceController extends SimpleControllerBase
}
/**
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
* @throws SPException
* Returns JS resources
*/
public function jsAction()
{
$this->request->verifySignature($this->configData->getPasswordSalt());
$file = $this->request->analyzeString('f');
$base = $this->request->analyzeString('b');
$minify = $this->dic->get(Minify::class);
if ($file && $base) {
$minify->setType(Minify::FILETYPE_JS)
$this->minify
->setType(Minify::FILETYPE_JS)
->setBase(urldecode($base), true)
->addFilesFromString(urldecode($file))
->getMinified();
} else {
$minify->setType(Minify::FILETYPE_JS)
$this->minify->setType(Minify::FILETYPE_JS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js');
$group = $this->request->analyzeInt('g', 0);
if ($group === 0) {
$minify->addFiles([
$this->minify->addFiles([
'jquery-3.3.1.min.js',
'jquery-migrate-3.0.0.min.js',
'jquery.fileDownload.min.js',
@@ -116,7 +106,7 @@ final class ResourceController extends SimpleControllerBase
'eventsource.min.js'], false);
} elseif ($group === 1) {
// FIXME: use MIN version
$minify->addFiles([
$this->minify->addFiles([
'app.js',
'app-triggers.js',
'app-actions.js',
@@ -124,7 +114,17 @@ final class ResourceController extends SimpleControllerBase
'app-main.js'], false);
}
$minify->getMinified();
$this->minify->getMinified();
}
}
/**
* @throws SPException
*/
protected function initialize()
{
$this->request->verifySignature($this->configData->getPasswordSalt());
$this->minify = $this->dic->get(Minify::class);
}
}