+
-
+
+
+
- {{ \'use.regex\' | translate }}
- {{ ::credential.label}}
')); - } - $scope.selectedCredential = angular.copy(credential); - $rootScope.$emit('app_menu', true); - }; + $scope.filtered_credentials=$scope.filterHidden(creds_filtered); + }; - $scope.closeSelected = function () { - $rootScope.$emit('app_menu', false); - $scope.selectedCredential = false; - }; + $scope.filterStrength = function(strength_min, strength_max){ + var initialCredentials=$scope.active_vault.credentials; + var postFiltered=[]; + for (var i = 0; i < initialCredentials.length; i++) { + var _credential = initialCredentials[i]; + var zxcvbn_result = zxcvbn(_credential.password); - $rootScope.$on('logout', function () { - if($scope.active_vault) { - $rootScope.vaultCache[$scope.active_vault.guid] = null; - } - $scope.active_vault = null; - $scope.credentials = []; -// $scope.$parent.selectedVault = false; + if(zxcvbn_result.score>=strength_min && zxcvbn_result.score<=strength_max){ + postFiltered.push(initialCredentials[i]); + } + } + $scope.filtered_credentials=$scope.filterHidden(postFiltered); + }; + + $scope.filterExpired = function(){ + var initialCredentials=$scope.active_vault.credentials; + var now = Date.now(); + var postFiltered=[]; + + for (var i = 0; i < initialCredentials.length; i++) { + var _credential = initialCredentials[i]; + + if(_credential.expire_time!==0 && _credential.expire_time <= now){ + postFiltered.push(initialCredentials[i]); + } + } + $scope.filtered_credentials=$scope.filterHidden(postFiltered); + }; + + $scope.filterHidden = function(list){ + var list_without_hidden=[]; + for (var i = 0; i < list.length; i++) { + if(list[i].hidden!==1){ + list_without_hidden.push(list[i]); + } + } + return list_without_hidden; + }; + + + + $scope.selectedtags = []; + var to; + $rootScope.$on('selected_tags_updated', function (evt, _sTags) { + var _selectedTags = []; + for (var x = 0; x < _sTags.length; x++) { + _selectedTags.push(_sTags[x].text); + } + $scope.selectedtags = _selectedTags; + $timeout.cancel(to); + if (_selectedTags.length > 0) { + to = $timeout(function () { + if ($scope.filtered_credentials) { + var _filtered_tags = []; + for (var i = 0; i < $scope.filtered_credentials.length; i++) { + var tags = $scope.filtered_credentials[i].tags_raw; + for (var x = 0; x < tags.length; x++) { + var tag = tags[x].text; + if (_filtered_tags.indexOf(tag) === -1) { + _filtered_tags.push(tag); + } + } + } + + $rootScope.$emit('limit_tags_in_list', _filtered_tags); + } + }, 50); + } + }); + + $scope.delete_time = 0; + $scope.showCredentialRow = function (credential) { + if ($scope.delete_time === 0) { + return credential.delete_time === 0; + } else { + return credential.delete_time > $scope.delete_time; + } + + }; + + $rootScope.$on('set_delete_time', function (event, time) { + $scope.delete_time = time; + }); + + $scope.setDeleteTime = function (delete_time) { + $scope.delete_time = delete_time; + }; + + $scope.selectedCredential = false; + $scope.selectCredential = function (credential) { + if (credential.description) { + credential.description_html = $sce.trustAsHtml(angular.copy(credential.description).replace("\n", '
')); + } + $scope.selectedCredential = angular.copy(credential); + $rootScope.$emit('app_menu', true); + }; + + $scope.closeSelected = function () { + $rootScope.$emit('app_menu', false); + $scope.selectedCredential = false; + }; + + $rootScope.$on('logout', function () { + if ($scope.active_vault) { + $rootScope.vaultCache[$scope.active_vault.guid] = null; + } + $scope.active_vault = null; + $scope.credentials = []; + //$scope.$parent.selectedVault = false; }); diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js index 5c9ad4f0..6f1abc9a 100644 --- a/js/app/controllers/edit_credential.js +++ b/js/app/controllers/edit_credential.js @@ -32,8 +32,8 @@ * Controller of the passmanApp */ angular.module('passmanApp') - .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', 'EncryptService', 'TagService', 'NotificationService', 'ShareService', '$translate', - function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService, EncryptService, TagService, NotificationService, ShareService, $translate) { + .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', 'EncryptService', 'TagService', 'NotificationService', 'ShareService', '$translate', '$rootScope', + function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService, EncryptService, TagService, NotificationService, ShareService, $translate, $rootScope) { $scope.active_vault = VaultService.getActiveVault(); if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!$scope.active_vault) { @@ -292,7 +292,7 @@ }; $scope.saving = false; $scope.saveCredential = function () { - $scope.saving = true; + $scope.saving = true; if ($scope.new_custom_field.label && $scope.new_custom_field.value) { @@ -301,8 +301,8 @@ if ($scope.storedCredential.password !== $scope.storedCredential.password_repeat){ - $scope.saving = false; - NotificationService.showNotification($translate.instant('password.do.not.match'), 5000); + $scope.saving = false; + NotificationService.showNotification($translate.instant('password.do.not.match'), 5000); return; } @@ -313,7 +313,7 @@ if (!$scope.storedCredential.credential_id) { $scope.storedCredential.vault_id = $scope.active_vault.vault_id; CredentialService.createCredential($scope.storedCredential).then(function () { - $scope.saving = false; + $scope.saving = false; $location.path('/vault/' + $routeParams.vault_id); NotificationService.showNotification($translate.instant('credential.created'), 5000); @@ -345,14 +345,26 @@ _credential.description = _credential.description.replace(regex, ""); } CredentialService.updateCredential(_credential, _useKey).then(function () { - $scope.saving = false; + $scope.saving = false; SettingsService.setSetting('edit_credential', null); $location.path('/vault/' + $routeParams.vault_id); NotificationService.showNotification($translate.instant('credential.updated'), 5000); }); } + $scope.refreshListWithSaved(); + }; - }; + $scope.refreshListWithSaved = function () { + var current_vault = $rootScope.vaultCache[$scope.active_vault.guid]; + var cv_credentials = current_vault.credentials; + for (var i = 0; i < cv_credentials.length; i++) { + if (cv_credentials[i].credential_id === $scope.storedCredential.credential_id) { + cv_credentials[i] = $scope.storedCredential; + } + } + current_vault.credentials=cv_credentials; + $rootScope.vaultCache[$scope.active_vault.guid] = current_vault; + }; $scope.cancel = function () { $location.path('/vault/' + $routeParams.vault_id); diff --git a/js/app/controllers/main.js b/js/app/controllers/main.js index c122501c..d54a46d3 100644 --- a/js/app/controllers/main.js +++ b/js/app/controllers/main.js @@ -41,6 +41,10 @@ } + $scope.removeHiddenStyles = function(){ + document.getElementById('warning_bar').classList.remove('template-hidden'); + }; + $rootScope.$on('settings_loaded', function(){ if (SettingsService.isEnabled('disable_contextmenu')) { document.addEventListener('contextmenu', function (event) { diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index f892af38..fdb3a208 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -23,7 +23,6 @@ (function () { 'use strict'; - /** * @ngdoc function * @name passmanApp.controller:MenuCtrl @@ -32,15 +31,21 @@ * Controller of the passmanApp */ angular.module('passmanApp') - .controller('MenuCtrl', ['$scope', 'VaultService', '$location', '$rootScope', 'TagService','SettingsService', - function ($scope, VaultService, $location, $rootScope, TagService, SettingsService) { + .controller('MenuCtrl', ['$scope', 'VaultService', '$location', '$rootScope', 'TagService','SettingsService', '$translate', + function ($scope, VaultService, $location, $rootScope, TagService, SettingsService, $translate) { $rootScope.logout = function () { + //see vault.js:54 + $rootScope.override_default_vault=true; SettingsService.setSetting('defaultVaultPass', false); TagService.resetTags(); $rootScope.$broadcast('logout'); $location.path('/'); }; + $scope.removeHiddenStyles = function(){ + document.getElementById('app-navigation').classList.remove('template-hidden'); + }; + $scope.selectedTags = []; $scope.getTags = function ($query) { return TagService.searchTag($query); @@ -77,12 +82,139 @@ $rootScope.$broadcast('selected_tags_updated', $scope.selectedTags); }, true); - $scope.tagClicked = function (tag) { - $scope.selectedTags.push(tag); + $scope.tagSelected = function (tag) { + for (var i = 0; i < $scope.selectedTags.length; i++) { + if($scope.selectedTags[i].text === tag.text){ + return true; + } + } + return false; }; + $scope.removeTagFromSelected = function (tag) { + var where =-1; + for (var i = 0; i < $scope.selectedTags.length; i++) { + if($scope.selectedTags[i].text === tag.text){ + where=i; + } + } + if(where === -1){ + //console.log("Cant remove selected Tag, Tag not present!"); + } + $scope.selectedTags.splice(where, 1); + }; + + $scope.clearForm = function () { + document.getElementById('tagsearch').value=""; + }; + + $scope.tagClickedString = function (tagtext) { + var tag=[]; + tag.text=tagtext; + $scope.tagClicked(tag); + }; + + $scope.tagClicked = function (tag) { + //check if tag already selected + if(!$scope.tagSelected(tag)){ + $scope.selectedTags.push(tag); + }else{ + //console.log("Already selected Tag!"); + $scope.removeTagFromSelected(tag); + } + }; + + //searchboxfix + var native_search = document.getElementById("searchbox"); + if(native_search !== null){ + native_search.nextElementSibling.addEventListener('click', function (e) { + $scope.$apply(function () { + $rootScope.$broadcast('nc_searchbox',""); + }); + }); + + native_search.classList.remove('hidden'); + native_search.addEventListener('keypress', function (e) { + if(e.keyCode === 13){ + e.preventDefault(); + } + }); + + native_search.addEventListener('keyup', function (e) { + $scope.$apply(function () { + $rootScope.$broadcast('nc_searchbox',native_search.value); + }); + }); + } + + + $scope.clickedNavigationItem="all"; + $scope.filterCredentialBySpecial = function (string) { + $scope.clickedNavigationItem=string; + if(string !== "nav_trashbin"){ + $scope.delete_time=0; + $rootScope.$broadcast('set_delete_time', $scope.delete_time); + } + $scope.selectedTags =[]; + + $rootScope.$broadcast('filterSpecial',string); + + //close settings when item is selected + $scope.settingsShown=false; + }; + + $scope.collapsedDefaultValue=true; + $scope.tagCollapsibleOpen=VaultService.getVaultSetting("vaultTagCollapsedState",$scope.collapsedDefaultValue); + $scope.tagCollapsibleClicked = function () { + if (VaultService.getVaultSetting("vaultTagCollapsedState",$scope.collapsedDefaultValue) === true) { + VaultService.setVaultSetting("vaultTagCollapsedState",false); + } else { + VaultService.setVaultSetting("vaultTagCollapsedState",true); + } + }; + + $scope.tagCollapsibleState = function () { + if(VaultService.getVaultSetting('vaultTagCollapsedState',$scope.collapsedDefaultValue)){ + return ""; + } + return "open"; + }; + + + + //this is needed, because the translation is not ready when the dom loads and the translation only returns the key. + //then the key is set, and the taginput is collapsed by angular. If the correct translation loads, the collapsed dom element does not update itself. + //here we set the value manually + $scope.initPlaceholder = function () { + $translate.onReady().then(function(){ + var string=$translate.instant('navigation.advanced.filter'); + document.getElementById("tags-input-outer").setAttribute("placeholder", string); + document.getElementById("tags-input-outer").firstChild.firstChild.childNodes[1].setAttribute("placeholder", string); + }); + }; + + $scope.legacyNavbarDefault=true; + $scope.legacyNavbarAlreadyInitialized=false; + + if (typeof $scope.legacyNavbar === 'undefined') { + $scope.legacyNavbar = $scope.legacyNavbarDefault; + } + + $scope.$watch('legacyNavbar', function(newValue, oldValue) { + VaultService.setVaultSetting("vaultNavBarLegacy",newValue); + }); + + $scope.initializeNavbar = function () { + if($scope.legacyNavbarAlreadyInitialized){ + return; + } + $scope.legacyNavbar = VaultService.getVaultSetting('vaultNavBarLegacy',$scope.legacyNavbarDefault); + $scope.legacyNavbarAlreadyInitialized=true; + }; + $rootScope.$on('credentials_loaded', function () { $rootScope.$broadcast('selected_tags_updated', $scope.selectedTags); + $scope.initializeNavbar(); }); $scope.available_tags = TagService.getTags(); @@ -91,10 +223,14 @@ if ($scope.selectedTags.length === 0) { return TagService.getTags(); } else { - return $scope.filtered_tags; + return TagService.getTags(); + //Always show all tags + //return $scope.filtered_tags; } }, function (tags) { - $scope.available_tags = tags; + //Always show all tags + //$scope.available_tags = tags; + $scope.available_tags = TagService.getTags(); }, true); $scope.toggleDeleteTime = function () { @@ -102,8 +238,9 @@ $scope.delete_time = 0; } else { $scope.delete_time = 1; + this.filterCredentialBySpecial('nav_trashbin'); } $rootScope.$broadcast('set_delete_time', $scope.delete_time); }; }]); -}()); \ No newline at end of file +}()); diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js index de14b39a..cf724524 100644 --- a/js/app/controllers/vault.js +++ b/js/app/controllers/vault.js @@ -46,7 +46,11 @@ var vault = vaults[i]; if (vault.guid === default_vault.guid) { $scope.default_vault = true; - $scope.list_selected_vault = vault; + //This prevents the opening of the default vault if the user logs out + if(!$rootScope.override_default_vault){ + $scope.list_selected_vault = vault; + $rootScope.override_default_vault=false; + } SettingsService.setSetting('defaultVault', vault); if (SettingsService.getSetting('defaultVaultPass')) { $location.path('/vault/' + vault.guid); @@ -219,7 +223,8 @@ }; - $scope.createVault = function (vault_name, vault_key, vault_key2) { + + $scope.createVault = function (vault_name, vault_key, vault_key2) { if (vault_key !== vault_key2) { $scope.error = $translate.instant('password.do.not.match'); return; diff --git a/js/app/directives/credentialfield.js b/js/app/directives/credentialfield.js index fbf7905e..44a6c276 100644 --- a/js/app/directives/credentialfield.js +++ b/js/app/directives/credentialfield.js @@ -50,12 +50,12 @@ '', link: function (scope) { var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/gi; var regex = new RegExp(expression); - $translate(['toggle.visibility', 'copy', 'copied']).then(function (translations) { + $translate(['toggle.visibility','copy.field', 'copy', 'copied']).then(function (translations) { scope.tggltxt = translations['toggle.visibility']; scope.copy_msg = translations['copy.field']; }); diff --git a/js/app/directives/icon.js b/js/app/directives/icon.js index 21e70d1d..646dec01 100644 --- a/js/app/directives/icon.js +++ b/js/app/directives/icon.js @@ -32,7 +32,7 @@ angular.module('passmanApp').directive('credentialIcon', [ '$window', function($window) { return { - template: '
- {{tab.title}}
- {{tab.title}}
- {{tab.title}}
');
+ '
- {{tab.title | translate}}
{{ \'use.regex\' | translate }}
- {{ ::credential.label}}
-
-
+
+
-
+
+
diff --git a/templates/public_share.php b/templates/public_share.php
index ddb7e035..2515cdf9 100644
--- a/templates/public_share.php
+++ b/templates/public_share.php
@@ -66,8 +66,9 @@ style('passman', 'app');
style('passman', 'public-page');
?>
-
+
+
+
+
+
+
-
+
diff --git a/templates/views/credential_revisions.html b/templates/views/credential_revisions.html
index 6cea920f..49fc33d6 100644
--- a/templates/views/credential_revisions.html
+++ b/templates/views/credential_revisions.html
@@ -1,21 +1,19 @@
-
-
-
diff --git a/templates/views/partials/forms/settings/import.html b/templates/views/partials/forms/settings/import.html
index 97c01169..74007afa 100644
--- a/templates/views/partials/forms/settings/import.html
+++ b/templates/views/partials/forms/settings/import.html
@@ -8,16 +8,16 @@
-