diff --git a/inc/SP/Account/Account.class.php b/inc/SP/Account/Account.class.php index 0a3fbccd..1b250749 100644 --- a/inc/SP/Account/Account.class.php +++ b/inc/SP/Account/Account.class.php @@ -32,7 +32,6 @@ use SP\DataModel\AccountData; use SP\DataModel\AccountExtData; use SP\DataModel\CustomFieldData; use SP\DataModel\GroupAccountsData; -use SP\Html\Html; use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\CustomFields\CustomField; diff --git a/inc/SP/Api/ApiTokens.class.php b/inc/SP/Api/ApiTokens.class.php index 61fed896..95ff682e 100644 --- a/inc/SP/Api/ApiTokens.class.php +++ b/inc/SP/Api/ApiTokens.class.php @@ -28,10 +28,6 @@ defined('APP_ROOT') || die(); use SP\Core\Exceptions\SPException; use SP\Core\Session; -use SP\Html\Html; -use SP\Log\Email; -use SP\Log\Log; -use SP\Mgmt\Users\UserUtil; use SP\Storage\DB; use SP\Storage\QueryData; diff --git a/inc/SP/Auth/AuthUtil.class.php b/inc/SP/Auth/AuthUtil.class.php index 3daced2d..9c4fa6ce 100644 --- a/inc/SP/Auth/AuthUtil.class.php +++ b/inc/SP/Auth/AuthUtil.class.php @@ -30,7 +30,6 @@ use SP\DataModel\UserData; use SP\DataModel\UserPassRecoverData; use SP\Html\Html; use SP\Log\Email; -use SP\Log\Log; use SP\Mgmt\Users\UserPassRecover; use SP\Storage\DB; use SP\Storage\QueryData; diff --git a/inc/SP/Controller/ConfigActionController.class.php b/inc/SP/Controller/ConfigActionController.class.php index 3bd308ef..2121767a 100644 --- a/inc/SP/Controller/ConfigActionController.class.php +++ b/inc/SP/Controller/ConfigActionController.class.php @@ -35,7 +35,6 @@ use SP\Core\CryptMasterPass; use SP\Core\Exceptions\SPException; use SP\Core\Session; use SP\Core\XmlExport; -use SP\Html\Html; use SP\Http\Request; use SP\Import\Import; use SP\Import\ImportParams; diff --git a/inc/SP/Controller/ItemsController.class.php b/inc/SP/Controller/ItemsController.class.php index 7adb71e9..638e776e 100644 --- a/inc/SP/Controller/ItemsController.class.php +++ b/inc/SP/Controller/ItemsController.class.php @@ -24,7 +24,6 @@ namespace SP\Controller; -use SP\Account\AccountUtil; use SP\Core\ItemsTypeInterface; use SP\DataModel\DataModelInterface; use SP\Mgmt\Categories\Category; diff --git a/inc/SP/Mgmt/Categories/Category.class.php b/inc/SP/Mgmt/Categories/Category.class.php index 7fbfb840..d443e46b 100644 --- a/inc/SP/Mgmt/Categories/Category.class.php +++ b/inc/SP/Mgmt/Categories/Category.class.php @@ -31,8 +31,6 @@ use SP\Core\ActionsInterface; use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\CustomFieldData; -use SP\Html\Html; -use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\CustomFields\CustomField; use SP\Mgmt\ItemInterface; diff --git a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php index 4e13da17..5143e433 100644 --- a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php +++ b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php @@ -28,7 +28,6 @@ defined('APP_ROOT') || die(); use SP\Core\Crypt; use SP\Core\Exceptions\SPException; -use SP\Core\Messages\LogMessage; use SP\DataModel\CustomFieldData; use SP\DataModel\CustomFieldDefData; use SP\Log\Log; diff --git a/inc/SP/Mgmt/Customers/Customer.class.php b/inc/SP/Mgmt/Customers/Customer.class.php index de53bd92..624b0900 100644 --- a/inc/SP/Mgmt/Customers/Customer.class.php +++ b/inc/SP/Mgmt/Customers/Customer.class.php @@ -31,8 +31,6 @@ use SP\Core\ActionsInterface; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomerData; use SP\DataModel\CustomFieldData; -use SP\Html\Html; -use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\CustomFields\CustomField; use SP\Mgmt\ItemInterface; diff --git a/inc/SP/Mgmt/Groups/Group.class.php b/inc/SP/Mgmt/Groups/Group.class.php index 424e658e..185912d8 100644 --- a/inc/SP/Mgmt/Groups/Group.class.php +++ b/inc/SP/Mgmt/Groups/Group.class.php @@ -28,8 +28,6 @@ namespace SP\Mgmt\Groups; use SP\Core\Exceptions\SPException; use SP\DataModel\GroupData; use SP\DataModel\GroupUsersData; -use SP\Html\Html; -use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\ItemInterface; use SP\Mgmt\ItemSelectInterface; diff --git a/inc/SP/Mgmt/Plugins/Plugin.class.php b/inc/SP/Mgmt/Plugins/Plugin.class.php index 2217a89c..56c2073a 100644 --- a/inc/SP/Mgmt/Plugins/Plugin.class.php +++ b/inc/SP/Mgmt/Plugins/Plugin.class.php @@ -26,8 +26,6 @@ namespace SP\Mgmt\Plugins; use SP\Core\Exceptions\SPException; use SP\DataModel\PluginData; -use SP\Html\Html; -use SP\Log\Log; use SP\Mgmt\ItemInterface; use SP\Storage\DB; use SP\Storage\QueryData; diff --git a/inc/SP/Mgmt/Profiles/Profile.class.php b/inc/SP/Mgmt/Profiles/Profile.class.php index 01dd668d..488abfa8 100644 --- a/inc/SP/Mgmt/Profiles/Profile.class.php +++ b/inc/SP/Mgmt/Profiles/Profile.class.php @@ -31,9 +31,6 @@ use SP\Core\Exceptions\SPException; use SP\Core\Session; use SP\DataModel\ProfileBaseData; use SP\DataModel\ProfileData; -use SP\Html\Html; -use SP\Log\Email; -use SP\Log\Log; use SP\Mgmt\ItemInterface; use SP\Mgmt\ItemSelectInterface; use SP\Mgmt\ItemTrait; diff --git a/inc/SP/Mgmt/PublicLinks/PublicLink.class.php b/inc/SP/Mgmt/PublicLinks/PublicLink.class.php index 1fc4c99d..5d1d8400 100644 --- a/inc/SP/Mgmt/PublicLinks/PublicLink.class.php +++ b/inc/SP/Mgmt/PublicLinks/PublicLink.class.php @@ -31,7 +31,6 @@ use SP\Core\Session; use SP\DataModel\PublicLinkBaseData; use SP\DataModel\PublicLinkData; use SP\DataModel\PublicLinkListData; -use SP\Html\Html; use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\ItemInterface; diff --git a/inc/SP/Mgmt/Users/User.class.php b/inc/SP/Mgmt/Users/User.class.php index d3a50541..1221a82c 100644 --- a/inc/SP/Mgmt/Users/User.class.php +++ b/inc/SP/Mgmt/Users/User.class.php @@ -26,12 +26,8 @@ namespace SP\Mgmt\Users; defined('APP_ROOT') || die(); -use SP\Auth\AuthUtil; use SP\Core\Exceptions\SPException; use SP\DataModel\UserData; -use SP\Html\Html; -use SP\Log\Email; -use SP\Log\Log; use SP\Mgmt\ItemInterface; use SP\Mgmt\ItemSelectInterface; use SP\Mgmt\ItemTrait; diff --git a/inc/SP/Mgmt/Users/UserPass.class.php b/inc/SP/Mgmt/Users/UserPass.class.php index 933f1d34..c85d9018 100644 --- a/inc/SP/Mgmt/Users/UserPass.class.php +++ b/inc/SP/Mgmt/Users/UserPass.class.php @@ -31,7 +31,6 @@ use SP\Core\Crypt; use SP\Core\Exceptions\SPException; use SP\Core\SessionUtil; use SP\DataModel\UserPassData; -use SP\Html\Html; use SP\Log\Email; use SP\Log\Log; use SP\Storage\DB; diff --git a/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php b/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php index 78fed563..86bae16e 100644 --- a/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php +++ b/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php @@ -29,7 +29,6 @@ use Plugins\Authenticator\AuthenticatorPlugin; use SP\Config\Config; use SP\Core\Exceptions\SPException; use SP\Core\Init; -use SP\Core\Session; use SP\DataModel\PluginData; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php index b1487d9f..deb0b615 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -366,7 +366,7 @@ class Util */ public static function getVersion($retBuild = false) { - $build = '17011302'; + $build = '17011601'; $version = [2, 0, 0]; if ($retBuild) { diff --git a/inc/themes/material-blue/js/app-theme.js b/inc/themes/material-blue/js/app-theme.js index aa45bcd1..7df67b16 100644 --- a/inc/themes/material-blue/js/app-theme.js +++ b/inc/themes/material-blue/js/app-theme.js @@ -355,6 +355,7 @@ sysPass.Theme = function (Common) { }; var $tagsSelect = $frmSearch.find("#tags")[0]; + var $tagsBar = $frmSearch.find(".search-filters-tags"); var $showFilter = $frmSearch.find("i.show-filter"); $resContent.on("click", "#data-search-header .sort-down,#data-search-header .sort-up", function () { @@ -369,7 +370,7 @@ sysPass.Theme = function (Common) { checkFavorite($this); }); }).on("click", "#search-rows span.tag", function () { - if ($showFilter.data("state") == 0) { + if ($tagsBar.is(":hidden")) { $showFilter.trigger("click"); } @@ -378,13 +379,12 @@ sysPass.Theme = function (Common) { $showFilter.on("click", function () { var $this = $(this); - var $tags = $frmSearch.find(".search-filters-tags"); - if ($tags.is(":hidden")) { - $tags.slideDown("slow"); + if ($tagsBar.is(":hidden")) { + $tagsBar.slideDown("slow"); $this.html($this.data("icon-up")); } else { - $tags.slideUp("slow"); + $tagsBar.slideUp("slow"); $this.html($this.data("icon-down")); } }); diff --git a/inc/themes/material-blue/js/app-theme.min.js b/inc/themes/material-blue/js/app-theme.min.js index e7e0e794..0ee47bdf 100644 --- a/inc/themes/material-blue/js/app-theme.min.js +++ b/inc/themes/material-blue/js/app-theme.min.js @@ -1,18 +1,18 @@ -var $jscomp={scope:{},findInternal:function(a,f,d){a instanceof String&&(a=String(a));for(var h=a.length,g=0;g=c||58<=c&&64>=c||91<=c&&96>=c||123<=c&&126>=c)||!a.passwordData.complexity.numbers&&48<=c&&57>=c||!a.passwordData.complexity.uppercase&&65<=c&&90>=c||(l++,e+=String.fromCharCode(c));$("#viewPass").attr("title",e);var k=zxcvbn(e);a.passwordData.passLength=e.length;b?(l=b.parent(),c=$("#"+b.attr("id")+"R"), -a.outputResult(k,b),b=new MaterialTextfield,l.find("input:password").val(e),l.addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),c.val(e).parent().addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),a.encryptFormValue(c),l.find("#passLevel").show(500)):(a.outputResult(k),$("input:password, input.password").val(e),$("#passLevel").show(500))},h=function(){$("
").dialog({modal:!0,title:a.config().LANG[29],width:"400px",open:function(){var b=$(this),l= +sysPass.Theme=function(a){var f=a.log,d=function(b){for(var l=0,e="",c;l=c||58<=c&&64>=c||91<=c&&96>=c||123<=c&&126>=c)||!a.passwordData.complexity.numbers&&48<=c&&57>=c||!a.passwordData.complexity.uppercase&&65<=c&&90>=c||(l++,e+=String.fromCharCode(c));$("#viewPass").attr("title",e);var d=zxcvbn(e);a.passwordData.passLength=e.length;b?(l=b.parent(),c=$("#"+b.attr("id")+"R"), +a.outputResult(d,b),b=new MaterialTextfield,l.find("input:password").val(e),l.addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),c.val(e).parent().addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),a.encryptFormValue(c),l.find("#passLevel").show(500)):(a.outputResult(d),$("input:password, input.password").val(e),$("#passLevel").show(500))},k=function(){$("
").dialog({modal:!0,title:a.config().LANG[29],width:"400px",open:function(){var b=$(this),l= '
'; b.html(l);b.dialog("option","position","center");b.ready(function(){$("#checkbox-numbers").prop("checked",a.passwordData.complexity.numbers);$("#checkbox-uppercase").prop("checked",a.passwordData.complexity.uppercase);$("#checkbox-symbols").prop("checked",a.passwordData.complexity.symbols);$("#passlength").val(a.passwordData.complexity.numlength);$("#btn-complexity").click(function(){a.passwordData.complexity.numbers=$(" #checkbox-numbers").is(":checked");a.passwordData.complexity.uppercase=$("#checkbox-uppercase").is(":checked"); -a.passwordData.complexity.symbols=$("#checkbox-symbols").is(":checked");a.passwordData.complexity.numlength=parseInt($("#passlength").val());b.dialog("close")});componentHandler.upgradeDom()})},close:function(){$(this).dialog("destroy")}})},g=function(b){b.find(".passwordfield__input").each(function(){var b=$(this);if("true"!==b.attr("data-pass-upgraded")){var e=b.parent(),c=b.attr("id"),k=$("#"+c+"R"),m='',m=m+('