diff --git a/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php b/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php index a428e04d..0d349fdb 100644 --- a/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php @@ -202,7 +202,7 @@ final class EventlogGrid extends GridBase $gridAction->setIcon($this->icons->getIconClear()); $gridAction->setOnClickFunction('eventlog/clear'); $gridAction->addData('action-route', Acl::getActionRoute(ActionsInterface::EVENTLOG_CLEAR)); - $gridAction->addData('nextaction', Acl::getActionRoute(ActionsInterface::EVENTLOG)); + $gridAction->addData('action-next', Acl::getActionRoute(ActionsInterface::EVENTLOG)); return $gridAction; } diff --git a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php index c0679f51..e1536ccd 100644 --- a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php @@ -226,7 +226,7 @@ final class NotificationGrid extends GridBase $gridAction->setOnClickFunction('notification/check'); $gridAction->setFilterRowSource('checked'); $gridAction->addData('action-route', Acl::getActionRoute(ActionsInterface::NOTIFICATION_CHECK)); - $gridAction->addData('nextaction', Acl::getActionRoute(ActionsInterface::NOTIFICATION)); + $gridAction->addData('action-next', Acl::getActionRoute(ActionsInterface::NOTIFICATION)); return $gridAction; } @@ -260,7 +260,7 @@ final class NotificationGrid extends GridBase $gridAction->setIcon($this->icons->getIconDelete()); $gridAction->setOnClickFunction('notification/delete'); $gridAction->addData('action-route', Acl::getActionRoute(ActionsInterface::NOTIFICATION_DELETE)); - $gridAction->addData('nextaction', Acl::getActionRoute(ActionsInterface::NOTIFICATION)); + $gridAction->addData('action-next', Acl::getActionRoute(ActionsInterface::NOTIFICATION)); return $gridAction; } diff --git a/app/modules/web/Controllers/ResourceController.php b/app/modules/web/Controllers/ResourceController.php index 67b8f916..b684f36a 100644 --- a/app/modules/web/Controllers/ResourceController.php +++ b/app/modules/web/Controllers/ResourceController.php @@ -55,15 +55,16 @@ final class ResourceController extends SimpleControllerBase ->getMinified(); } else { $this->minify->setType(Minify::FILETYPE_CSS) - ->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'css') - ->addFiles(['reset.min.css', + ->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'css') + ->addFiles([ + 'reset.min.css', 'jquery-ui.min.css', 'jquery-ui.structure.min.css', - 'fonts.min.css', 'material-icons.min.css', 'toastr.min.css', 'magnific-popup.min.css' ], false) + ->addFile('fonts.min.css', false, PUBLIC_PATH . DIRECTORY_SEPARATOR . 'css') ->getMinified(); } } @@ -83,12 +84,12 @@ final class ResourceController extends SimpleControllerBase ->addFilesFromString(urldecode($file)) ->getMinified(); } else { - $this->minify->setType(Minify::FILETYPE_JS) - ->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js'); - $group = $this->request->analyzeInt('g', 0); if ($group === 0) { + $this->minify->setType(Minify::FILETYPE_JS) + ->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'js'); + $this->minify->addFiles([ 'jquery-3.3.1.min.js', 'jquery-migrate-3.0.0.min.js', @@ -105,6 +106,9 @@ final class ResourceController extends SimpleControllerBase 'jquery.magnific-popup.min.js', 'eventsource.min.js'], false); } elseif ($group === 1) { + $this->minify->setType(Minify::FILETYPE_JS) + ->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js'); + // FIXME: use MIN version $this->minify->addFiles([ 'app.js', diff --git a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc deleted file mode 100644 index 304a3b55..00000000 --- a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc +++ /dev/null @@ -1,21 +0,0 @@ - - - -getData()->getDataCount() > 0): - foreach ($data->getData()->getData() as $dataIndex => $dataItem): - if ($dataIndex === 'count'): continue; endif; ?> - - - getData()->getDataRowSources() as $rowSrc): ?> - {$rowSrc['name']}() : $dataItem->{$rowSrc['name']}; ?> - - - - - - \ No newline at end of file diff --git a/app/modules/web/themes/material-blue/views/itemshow/authtoken.inc b/app/modules/web/themes/material-blue/views/itemshow/authtoken.inc index f19ab061..dd961794 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/authtoken.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/authtoken.inc @@ -9,7 +9,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash=""> diff --git a/app/modules/web/themes/material-blue/views/itemshow/category.inc b/app/modules/web/themes/material-blue/views/itemshow/category.inc index b97caa88..f9cecb09 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/category.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/category.inc @@ -9,7 +9,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/client.inc b/app/modules/web/themes/material-blue/views/itemshow/client.inc index c0d02626..2e8626a9 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/client.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/client.inc @@ -12,7 +12,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/customfield.inc b/app/modules/web/themes/material-blue/views/itemshow/customfield.inc index 1106df06..737728da 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/customfield.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/customfield.inc @@ -12,7 +12,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/publiclink.inc b/app/modules/web/themes/material-blue/views/itemshow/publiclink.inc index ba487993..64e99e37 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/publiclink.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/publiclink.inc @@ -9,7 +9,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/tag.inc b/app/modules/web/themes/material-blue/views/itemshow/tag.inc index a449c0c1..dff10f76 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/tag.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/tag.inc @@ -9,7 +9,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/user.inc b/app/modules/web/themes/material-blue/views/itemshow/user.inc index a7950719..df6c6d8b 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user.inc @@ -20,7 +20,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/usergroup.inc b/app/modules/web/themes/material-blue/views/itemshow/usergroup.inc index 94704a96..827ac936 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/usergroup.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/usergroup.inc @@ -12,7 +12,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/itemshow/userprofile.inc b/app/modules/web/themes/material-blue/views/itemshow/userprofile.inc index 31812041..f010fa61 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/userprofile.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/userprofile.inc @@ -13,7 +13,6 @@ data-onsubmit="appMgmt/save" data-action-route="" data-activetab="" - data-nextaction="" data-hash="">
diff --git a/app/modules/web/themes/material-blue/views/notification/notification.inc b/app/modules/web/themes/material-blue/views/notification/notification.inc index 4c418361..a2aa89bd 100644 --- a/app/modules/web/themes/material-blue/views/notification/notification.inc +++ b/app/modules/web/themes/material-blue/views/notification/notification.inc @@ -8,7 +8,7 @@
diff --git a/lib/SP/Html/Minify.php b/lib/SP/Html/Minify.php index a7c7fda8..78594467 100644 --- a/lib/SP/Html/Minify.php +++ b/lib/SP/Html/Minify.php @@ -124,7 +124,7 @@ final class Minify } else { if ($file['min'] === true && $disableMinify === false) { $data .= '/* MINIFIED FILE: ' . $file['name'] . ' */' . PHP_EOL; - + if ($this->type === self::FILETYPE_JS) { $data .= $this->jsCompress(file_get_contents($filePath)); } @@ -235,18 +235,24 @@ final class Minify * * @param string $file * @param bool $minify Si es necesario reducir + * @param string $base * * @return $this */ - public function addFile($file, $minify = true) + public function addFile($file, $minify = true, $base = null) { - $filePath = $this->base . DIRECTORY_SEPARATOR . $file; + if ($base === null) { + $base = $this->base; + $filePath = $this->base . DIRECTORY_SEPARATOR . $file; + } else { + $filePath = $base . DIRECTORY_SEPARATOR . $file; + } if (file_exists($filePath)) { $this->files[] = [ 'type' => 'file', - 'base' => $this->base, - 'name' => Request::getSecureAppFile($file, $this->base), + 'base' => $base, + 'name' => Request::getSecureAppFile($file, $base), 'min' => $minify === true && $this->needsMinify($file), 'md5' => md5_file($filePath) ]; diff --git a/public/css/fonts.css b/public/css/fonts.css index 08303774..0de08fc4 100644 --- a/public/css/fonts.css +++ b/public/css/fonts.css @@ -26,10 +26,10 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url("public/css/fonts/MaterialIcons-Regular.eot"); /* For IE6-8 */ + src: url("public/vendor/fonts/MaterialIcons-Regular.eot"); /* For IE6-8 */ src: local('Material Icons'), local('MaterialIcons-Regular'), - url("public/css/fonts/MaterialIcons-Regular.woff2") format('woff2'), - url("public/css/fonts/MaterialIcons-Regular.woff") format('woff'), - url("public/css/fonts/MaterialIcons-Regular.ttf") format('truetype'); + url("public/vendor/fonts/MaterialIcons-Regular.woff2") format('woff2'), + url("public/vendor/fonts/MaterialIcons-Regular.woff") format('woff'), + url("public/vendor/fonts/MaterialIcons-Regular.ttf") format('truetype'); } \ No newline at end of file diff --git a/public/css/fonts.min.css b/public/css/fonts.min.css index 6e3d36be..19d2903a 100644 --- a/public/css/fonts.min.css +++ b/public/css/fonts.min.css @@ -1 +1 @@ -@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url("public/css/fonts/MaterialIcons-Regular.eot");src:local('Material Icons'),local('MaterialIcons-Regular'),url("public/css/fonts/MaterialIcons-Regular.woff2") format('woff2'),url("public/css/fonts/MaterialIcons-Regular.woff") format('woff'),url("public/css/fonts/MaterialIcons-Regular.ttf") format('truetype')} \ No newline at end of file +@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url("public/vendor/fonts/MaterialIcons-Regular.eot");src:local('Material Icons'),local('MaterialIcons-Regular'),url("public/vendor/fonts/MaterialIcons-Regular.woff2") format('woff2'),url("public/vendor/fonts/MaterialIcons-Regular.woff") format('woff'),url("public/vendor/fonts/MaterialIcons-Regular.ttf") format('truetype')} \ No newline at end of file diff --git a/public/js/app-actions.js b/public/js/app-actions.js index b5fd3338..723f3894 100644 --- a/public/js/app-actions.js +++ b/public/js/app-actions.js @@ -1270,7 +1270,7 @@ sysPass.Actions = function (Common) { Common.msg.out(json); if (json.status === 0) { - getContent({r: $obj.data("nextaction")}); + getContent({r: $obj.data("action-next")}); } Common.sk.set(json.csrf); @@ -1371,7 +1371,7 @@ sysPass.Actions = function (Common) { Common.msg.out(json); if (json.status === 0) { - getContent({r: $obj.data("nextaction")}); + getContent({r: $obj.data("action-next")}); } Common.sk.set(json.csrf); @@ -1398,7 +1398,7 @@ sysPass.Actions = function (Common) { Common.msg.out(json); if (json.status === 0) { - getContent({r: $obj.data("nextaction")}); + getContent({r: $obj.data("action-next")}); $.magnificPopup.close(); } @@ -1423,7 +1423,7 @@ sysPass.Actions = function (Common) { Common.appRequests().getActionCall(opts, function (json) { Common.msg.out(json); - getContent({r: $obj.data("nextaction")}); + getContent({r: $obj.data("action-next")}); }); }); }, diff --git a/public/js/app-actions.min.js b/public/js/app-actions.min.js index 98c57745..a6322cdc 100644 --- a/public/js/app-actions.min.js +++ b/public/js/app-actions.min.js @@ -40,10 +40,10 @@ sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(c,function(a){0===a.length d?e.url=f.entrypoint+"?r="+a.data("action-route")+"/"+d+"/"+c:(e.url=f.entrypoint+"?r="+a.data("action-route"),e.data=a.serialize());b.appRequests().getActionCall(e,function(c){b.msg.out(c);0===c.status&&g({r:a.data("action-next")+"/"+d})})},d='

'+b.config().LANG[48]+"

";mdlDialog().show({text:d,negative:{title:b.config().LANG[44],onClick:function(a){a.preventDefault();c(0)}},positive:{title:b.config().LANG[43],onClick:function(a){a.preventDefault();c(1)}}})}, refresh:function(a){e.info("link:refresh");k.state.update(a);var c=a.data("item-id"),d=b.appRequests().getRequestOpts();d.url=f.entrypoint;d.method="get";d.data={r:a.data("action-route")+"/"+c,sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(d,function(d){b.msg.out(d);0===d.status&&((d=a.data("action-next"))?g({r:d+"/"+c}):g({r:k.state.tab.route,tabIndex:k.state.tab.index}))})}},eventlog:{search:function(a){e.info("eventlog:search");n.search(a)},nav:function(a){e.info("eventlog:nav");n.nav(a)}, clear:function(a){var c='

'+b.config().LANG[20]+"

";mdlDialog().show({text:c,negative:{title:b.config().LANG[44],onClick:function(a){a.preventDefault();b.msg.error(b.config().LANG[44])}},positive:{title:b.config().LANG[43],onClick:function(c){c.preventDefault();c=b.appRequests().getRequestOpts();c.url=f.entrypoint+"?r="+a.data("action-route");c.method="get";c.data={sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(c,function(c){b.msg.out(c);0===c.status&& -g({r:a.data("nextaction")});b.sk.set(c.csrf)})}}})}},ajaxUrl:f,plugin:{toggle:function(a){e.info("plugin:enable");k.save(a,function(){setTimeout(function(){b.redirect("index.php")},2E3)})},reset:function(a){e.info("plugin:reset");var c='

'+b.config().LANG[58]+"

";mdlDialog().show({text:c,negative:{title:b.config().LANG[44],onClick:function(a){a.preventDefault();b.msg.error(b.config().LANG[44])}},positive:{title:b.config().LANG[43],onClick:function(b){b.preventDefault(); -k.save(a)}}})}},notification:{check:function(a){e.info("notification:check");var c=b.appRequests().getRequestOpts();c.url=f.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(c,function(c){b.msg.out(c);0===c.status&&g({r:a.data("nextaction")});b.sk.set(c.csrf)})},search:function(a){e.info("notification:search");n.search(a)},show:function(a){e.info("notification:show");v.show(a)},save:function(a){e.info("notification:save"); -var c=b.appRequests().getRequestOpts();c.url=f.entrypoint+"?r="+a.data("route");c.data=a.serialize();b.appRequests().getActionCall(c,function(c){b.msg.out(c);0===c.status&&(g({r:a.data("nextaction")}),$.magnificPopup.close())})},"delete":function(a){e.info("notification:delete");n["delete"](a,function(c){var d=a.data("item-id"),e=b.appRequests().getRequestOpts();e.url=f.entrypoint;e.method="get";e.data={r:a.data("action-route")+(d?"/"+d:""),items:c,sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(e, -function(c){b.msg.out(c);g({r:a.data("nextaction")})})})},getActive:function(){e.info("notification:getActive");var a=b.appRequests().getRequestOpts();a.url=f.entrypoint;a.method="get";a.data={r:"items/notifications",sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(a,function(a){return a})},nav:function(a){e.info("eventlog:nav");n.nav(a)}},wiki:{show:function(a){e.info("wiki:show");var c=b.appRequests().getRequestOpts();c.url=f.entrypoint;c.method="get";c.data={pageName:a.data("pagename"),actionId:a.data("action-id"), +g({r:a.data("action-next")});b.sk.set(c.csrf)})}}})}},ajaxUrl:f,plugin:{toggle:function(a){e.info("plugin:enable");k.save(a,function(){setTimeout(function(){b.redirect("index.php")},2E3)})},reset:function(a){e.info("plugin:reset");var c='

'+b.config().LANG[58]+"

";mdlDialog().show({text:c,negative:{title:b.config().LANG[44],onClick:function(a){a.preventDefault();b.msg.error(b.config().LANG[44])}},positive:{title:b.config().LANG[43],onClick:function(b){b.preventDefault(); +k.save(a)}}})}},notification:{check:function(a){e.info("notification:check");var c=b.appRequests().getRequestOpts();c.url=f.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(c,function(c){b.msg.out(c);0===c.status&&g({r:a.data("action-next")});b.sk.set(c.csrf)})},search:function(a){e.info("notification:search");n.search(a)},show:function(a){e.info("notification:show");v.show(a)},save:function(a){e.info("notification:save"); +var c=b.appRequests().getRequestOpts();c.url=f.entrypoint+"?r="+a.data("route");c.data=a.serialize();b.appRequests().getActionCall(c,function(c){b.msg.out(c);0===c.status&&(g({r:a.data("action-next")}),$.magnificPopup.close())})},"delete":function(a){e.info("notification:delete");n["delete"](a,function(c){var d=a.data("item-id"),e=b.appRequests().getRequestOpts();e.url=f.entrypoint;e.method="get";e.data={r:a.data("action-route")+(d?"/"+d:""),items:c,sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(e, +function(c){b.msg.out(c);g({r:a.data("action-next")})})})},getActive:function(){e.info("notification:getActive");var a=b.appRequests().getRequestOpts();a.url=f.entrypoint;a.method="get";a.data={r:"items/notifications",sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(a,function(a){return a})},nav:function(a){e.info("eventlog:nav");n.nav(a)}},wiki:{show:function(a){e.info("wiki:show");var c=b.appRequests().getRequestOpts();c.url=f.entrypoint;c.method="get";c.data={pageName:a.data("pagename"),actionId:a.data("action-id"), sk:b.sk.get(),isAjax:1};b.appRequests().getActionCall(c,function(a){0!==a.status?b.msg.out(a):m(a.data.html)})}},items:r,ldap:{check:function(a){e.info("ldap:check");var c=$(a.data("src")),d=b.appRequests().getRequestOpts();d.url=f.entrypoint+"?r="+a.data("action-route");d.data=c.serialize()+"&sk="+b.sk.get();b.appRequests().getActionCall(d,function(a){b.msg.out(a);0===a.status&&void 0!==a.data.template&&void 0!==a.data.items&&m(a.data.template,{open:function(){var c=$("#ldap-results").find(".list-wrap").empty(); a.data.items.forEach(function(a){c.append(b.appTheme().html.getList(a.items,a.icon))})}})})},"import":function(a){e.info("ldap:import");var c='

'+b.config().LANG[57]+"

";mdlDialog().show({text:c,negative:{title:b.config().LANG[44],onClick:function(a){a.preventDefault();b.msg.error(b.config().LANG[44])}},positive:{title:b.config().LANG[43],onClick:function(c){c=$(a.data("src"));var d=b.appRequests().getRequestOpts();d.url=f.entrypoint+"?r="+a.data("action-route"); d.data=c.serialize()+"&sk="+b.sk.get();b.appRequests().getActionCall(d,function(a){b.msg.out(a)})}}})}}}}; diff --git a/public/css/jquery-ui.min.css b/public/vendor/css/jquery-ui.min.css similarity index 100% rename from public/css/jquery-ui.min.css rename to public/vendor/css/jquery-ui.min.css diff --git a/public/css/jquery-ui.structure.min.css b/public/vendor/css/jquery-ui.structure.min.css similarity index 100% rename from public/css/jquery-ui.structure.min.css rename to public/vendor/css/jquery-ui.structure.min.css diff --git a/public/css/magnific-popup.css b/public/vendor/css/magnific-popup.css similarity index 100% rename from public/css/magnific-popup.css rename to public/vendor/css/magnific-popup.css diff --git a/public/css/magnific-popup.min.css b/public/vendor/css/magnific-popup.min.css similarity index 100% rename from public/css/magnific-popup.min.css rename to public/vendor/css/magnific-popup.min.css diff --git a/public/css/material-icons.css b/public/vendor/css/material-icons.css similarity index 100% rename from public/css/material-icons.css rename to public/vendor/css/material-icons.css diff --git a/public/css/material-icons.min.css b/public/vendor/css/material-icons.min.css similarity index 100% rename from public/css/material-icons.min.css rename to public/vendor/css/material-icons.min.css diff --git a/public/css/reset.css b/public/vendor/css/reset.css similarity index 100% rename from public/css/reset.css rename to public/vendor/css/reset.css diff --git a/public/css/reset.min.css b/public/vendor/css/reset.min.css similarity index 100% rename from public/css/reset.min.css rename to public/vendor/css/reset.min.css diff --git a/public/css/toastr.css b/public/vendor/css/toastr.css similarity index 100% rename from public/css/toastr.css rename to public/vendor/css/toastr.css diff --git a/public/css/toastr.min.css b/public/vendor/css/toastr.min.css similarity index 100% rename from public/css/toastr.min.css rename to public/vendor/css/toastr.min.css diff --git a/public/css/fonts/MaterialIcons-Regular.eot b/public/vendor/fonts/MaterialIcons-Regular.eot similarity index 100% rename from public/css/fonts/MaterialIcons-Regular.eot rename to public/vendor/fonts/MaterialIcons-Regular.eot diff --git a/public/css/fonts/MaterialIcons-Regular.svg b/public/vendor/fonts/MaterialIcons-Regular.svg similarity index 100% rename from public/css/fonts/MaterialIcons-Regular.svg rename to public/vendor/fonts/MaterialIcons-Regular.svg diff --git a/public/css/fonts/MaterialIcons-Regular.ttf b/public/vendor/fonts/MaterialIcons-Regular.ttf similarity index 100% rename from public/css/fonts/MaterialIcons-Regular.ttf rename to public/vendor/fonts/MaterialIcons-Regular.ttf diff --git a/public/css/fonts/MaterialIcons-Regular.woff b/public/vendor/fonts/MaterialIcons-Regular.woff similarity index 100% rename from public/css/fonts/MaterialIcons-Regular.woff rename to public/vendor/fonts/MaterialIcons-Regular.woff diff --git a/public/css/fonts/MaterialIcons-Regular.woff2 b/public/vendor/fonts/MaterialIcons-Regular.woff2 similarity index 100% rename from public/css/fonts/MaterialIcons-Regular.woff2 rename to public/vendor/fonts/MaterialIcons-Regular.woff2 diff --git a/public/css/fonts/NotoSans-Regular-webfont.ttf b/public/vendor/fonts/NotoSans-Regular-webfont.ttf similarity index 100% rename from public/css/fonts/NotoSans-Regular-webfont.ttf rename to public/vendor/fonts/NotoSans-Regular-webfont.ttf diff --git a/public/js/clipboard.js b/public/vendor/js/clipboard.js similarity index 100% rename from public/js/clipboard.js rename to public/vendor/js/clipboard.js diff --git a/public/js/clipboard.min.js b/public/vendor/js/clipboard.min.js similarity index 100% rename from public/js/clipboard.min.js rename to public/vendor/js/clipboard.min.js diff --git a/public/js/eventsource.js b/public/vendor/js/eventsource.js similarity index 100% rename from public/js/eventsource.js rename to public/vendor/js/eventsource.js diff --git a/public/js/eventsource.min.js b/public/vendor/js/eventsource.min.js similarity index 100% rename from public/js/eventsource.min.js rename to public/vendor/js/eventsource.min.js diff --git a/public/js/jquery-3.3.1.js b/public/vendor/js/jquery-3.3.1.js similarity index 100% rename from public/js/jquery-3.3.1.js rename to public/vendor/js/jquery-3.3.1.js diff --git a/public/js/jquery-3.3.1.min.js b/public/vendor/js/jquery-3.3.1.min.js similarity index 100% rename from public/js/jquery-3.3.1.min.js rename to public/vendor/js/jquery-3.3.1.min.js diff --git a/public/js/jquery-migrate-3.0.0.js b/public/vendor/js/jquery-migrate-3.0.0.js similarity index 100% rename from public/js/jquery-migrate-3.0.0.js rename to public/vendor/js/jquery-migrate-3.0.0.js diff --git a/public/js/jquery-migrate-3.0.0.min.js b/public/vendor/js/jquery-migrate-3.0.0.min.js similarity index 100% rename from public/js/jquery-migrate-3.0.0.min.js rename to public/vendor/js/jquery-migrate-3.0.0.min.js diff --git a/public/js/jquery.fileDownload.min.js b/public/vendor/js/jquery.fileDownload.min.js similarity index 100% rename from public/js/jquery.fileDownload.min.js rename to public/vendor/js/jquery.fileDownload.min.js diff --git a/public/js/jquery.magnific-popup.js b/public/vendor/js/jquery.magnific-popup.js similarity index 100% rename from public/js/jquery.magnific-popup.js rename to public/vendor/js/jquery.magnific-popup.js diff --git a/public/js/jquery.magnific-popup.min.js b/public/vendor/js/jquery.magnific-popup.min.js similarity index 100% rename from public/js/jquery.magnific-popup.min.js rename to public/vendor/js/jquery.magnific-popup.min.js diff --git a/public/js/jsencrypt.js b/public/vendor/js/jsencrypt.js similarity index 100% rename from public/js/jsencrypt.js rename to public/vendor/js/jsencrypt.js diff --git a/public/js/jsencrypt.min.js b/public/vendor/js/jsencrypt.min.js similarity index 100% rename from public/js/jsencrypt.min.js rename to public/vendor/js/jsencrypt.min.js diff --git a/public/js/moment-timezone.js b/public/vendor/js/moment-timezone.js similarity index 97% rename from public/js/moment-timezone.js rename to public/vendor/js/moment-timezone.js index 2419c3a7..3f8fe9d6 100644 --- a/public/js/moment-timezone.js +++ b/public/vendor/js/moment-timezone.js @@ -1,17 +1,34 @@ -//! moment-timezone.js -//! version : 0.5.10 -//! Copyright (c) JS Foundation and other contributors -//! license : MIT -//! github.com/moment/moment-timezone +/* + * sysPass + * + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org + * + * This file is part of sysPass. + * + * sysPass is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * sysPass 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with sysPass. If not, see . + */ (function (root, factory) { "use strict"; /*global define*/ if (typeof define === 'function' && define.amd) { - define(['moment'], factory); // AMD + define(['vendor/moment'], factory); // AMD } else if (typeof module === 'object' && module.exports) { - module.exports = factory(require('moment')); // Node + module.exports = factory(require('vendor/moment')); // Node } else { factory(root.moment); // Browser } diff --git a/public/js/moment-timezone.min.js b/public/vendor/js/moment-timezone.min.js similarity index 92% rename from public/js/moment-timezone.min.js rename to public/vendor/js/moment-timezone.min.js index 73268a2e..86306f29 100644 --- a/public/js/moment-timezone.min.js +++ b/public/vendor/js/moment-timezone.min.js @@ -1,8 +1,8 @@ -(function(e,q){"function"===typeof define&&define.amd?define(["moment"],q):"object"===typeof module&&module.exports?module.exports=q(require("moment")):q(e.moment)})(this,function(e){function q(a){return 96A||2===A&&6>L)&&u("Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js "+e.version+". See momentjs.com");v.prototype={_set:function(a){this.name=a.name;this.abbrs=a.abbrs;this.untils=a.untils;this.offsets=a.offsets;this.population= a.population},_index:function(a){a=+a;var c=this.untils,b;for(b=0;be&&h.moveInvalidForward&&(f=e),a