diff --git a/app/locales/en_GB/LC_MESSAGES/messages.mo b/app/locales/en_GB/LC_MESSAGES/messages.mo index 60bae8c6..7d2497c8 100644 Binary files a/app/locales/en_GB/LC_MESSAGES/messages.mo and b/app/locales/en_GB/LC_MESSAGES/messages.mo differ diff --git a/app/locales/en_GB/LC_MESSAGES/messages.po b/app/locales/en_GB/LC_MESSAGES/messages.po index d6e66765..3e47ff14 100644 --- a/app/locales/en_GB/LC_MESSAGES/messages.po +++ b/app/locales/en_GB/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-30 01:24+0100\n" -"PO-Revision-Date: 2018-08-30 01:24+0100\n" +"POT-Creation-Date: 2018-09-01 21:03+0100\n" +"PO-Revision-Date: 2018-09-01 21:04+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_GB\n" @@ -74,7 +74,7 @@ msgstr "Please contact to the administrator" # Not available #: ../../../../lib/SP/Core/Acl/Acl.php:282 -#: ../../../../lib/SP/Services/Auth/LoginService.php:582 +#: ../../../../lib/SP/Services/Auth/LoginService.php:586 msgid "N/D" msgstr "N/A" @@ -83,7 +83,7 @@ msgid "Acceso denegado" msgstr "Access denied" #: ../../../../lib/SP/Core/Acl/Acl.php:288 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:103 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:30 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:32 msgid "Acción" @@ -94,17 +94,17 @@ msgstr "Action" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapMsAds.php:165 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:114 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:126 -#: ../../../../lib/SP/Services/Auth/LoginService.php:211 -#: ../../../../lib/SP/Services/Auth/LoginService.php:229 -#: ../../../../lib/SP/Services/Auth/LoginService.php:368 -#: ../../../../lib/SP/Services/Auth/LoginService.php:435 -#: ../../../../lib/SP/Services/Auth/LoginService.php:543 -#: ../../../../lib/SP/Services/Auth/LoginService.php:586 +#: ../../../../lib/SP/Services/Auth/LoginService.php:215 +#: ../../../../lib/SP/Services/Auth/LoginService.php:233 +#: ../../../../lib/SP/Services/Auth/LoginService.php:372 +#: ../../../../lib/SP/Services/Auth/LoginService.php:439 +#: ../../../../lib/SP/Services/Auth/LoginService.php:547 +#: ../../../../lib/SP/Services/Auth/LoginService.php:590 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:230 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:235 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 #: ../../../modules/web/Controllers/LoginController.php:102 #: ../../../modules/web/Controllers/UserController.php:278 #: ../../../modules/web/Controllers/UserController.php:312 @@ -126,11 +126,11 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/config/mail.inc:111 #: ../../../modules/web/themes/material-blue/views/config/wiki.inc:230 #: ../../../modules/web/themes/material-blue/views/config/wiki.inc:244 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:17 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:19 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:22 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:16 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:18 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:18 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:20 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:23 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:60 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:62 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:11 @@ -169,7 +169,7 @@ msgstr "Invalid context" msgid "Contexto no inicializado" msgstr "Context not initialized" -#: ../../../../lib/SP/Core/Context/SessionContext.php:545 +#: ../../../../lib/SP/Core/Context/SessionContext.php:547 msgid "La sesión no puede ser inicializada" msgstr "Session cannot be initialized" @@ -190,17 +190,17 @@ msgstr "The key file does not exist" #: ../../../../lib/SP/Repositories/AuthToken/AuthTokenRepository.php:333 #: ../../../../lib/SP/Repositories/AuthToken/AuthTokenRepository.php:388 #: ../../../../lib/SP/Repositories/AuthToken/AuthTokenRepository.php:416 -#: ../../../../lib/SP/Services/Account/AccountService.php:237 -#: ../../../../lib/SP/Services/Account/AccountService.php:242 +#: ../../../../lib/SP/Services/Account/AccountService.php:226 +#: ../../../../lib/SP/Services/Account/AccountService.php:231 #: ../../../../lib/SP/Services/Api/ApiService.php:129 #: ../../../../lib/SP/Services/Api/ApiService.php:227 #: ../../../../lib/SP/Services/Api/ApiService.php:235 -#: ../../../../lib/SP/Services/Auth/LoginService.php:182 -#: ../../../../lib/SP/Services/Auth/LoginService.php:333 -#: ../../../../lib/SP/Services/Auth/LoginService.php:482 -#: ../../../../lib/SP/Services/Auth/LoginService.php:487 -#: ../../../../lib/SP/Services/Auth/LoginService.php:519 -#: ../../../../lib/SP/Services/Auth/LoginService.php:626 +#: ../../../../lib/SP/Services/Auth/LoginService.php:186 +#: ../../../../lib/SP/Services/Auth/LoginService.php:337 +#: ../../../../lib/SP/Services/Auth/LoginService.php:486 +#: ../../../../lib/SP/Services/Auth/LoginService.php:491 +#: ../../../../lib/SP/Services/Auth/LoginService.php:523 +#: ../../../../lib/SP/Services/Auth/LoginService.php:630 #: ../../../../lib/SP/Services/AuthToken/AuthTokenService.php:306 #: ../../../../lib/SP/Services/CustomField/CustomFieldService.php:203 #: ../../../../lib/SP/Services/Export/XmlVerifyService.php:108 @@ -227,7 +227,7 @@ msgstr "An object is needed" msgid "Observador no inicializado" msgstr "Observer not initialized" -#: ../../../../lib/SP/Core/UI/Theme.php:191 +#: ../../../../lib/SP/Core/UI/Theme.php:193 msgid "Clase no válida para iconos" msgstr "Invalid icons class" @@ -241,19 +241,23 @@ msgstr "ON" msgid "OFF" msgstr "OFF" -#: ../../../../lib/SP/DataModel/TrackData.php:155 -#: ../../../../lib/SP/DataModel/TrackData.php:157 -#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:56 -#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:58 -msgid "IP inválida" -msgstr "Invalid IP" - #: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:306 #: ../../../../lib/SP/Mvc/View/Template.php:122 #, php-format msgid "No es posible obtener la plantilla \"%s\" : %s" msgstr "Unable to retrieve the \"%s\" template: %s" +#: ../../../../lib/SP/Http/Address.php:49 +#: ../../../../lib/SP/Http/Address.php:51 +#: ../../../../lib/SP/Http/Address.php:68 +#: ../../../../lib/SP/Http/Address.php:70 +#: ../../../../lib/SP/Http/Address.php:90 +#: ../../../../lib/SP/Http/Address.php:109 +#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:56 +#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:58 +msgid "IP inválida" +msgstr "Invalid IP" + #: ../../../../lib/SP/Http/Json.php:179 msgid "Error de codificación" msgstr "Encoding error" @@ -309,16 +313,16 @@ msgstr "New Plugin" #: ../../../../lib/SP/Plugin/PluginManager.php:246 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:114 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:98 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:99 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:100 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:111 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:102 #: ../../../modules/web/Controllers/UserGroupController.php:254 #: ../../../modules/web/Controllers/UserGroupController.php:293 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:22 @@ -331,12 +335,12 @@ msgstr "New Plugin" #: ../../../modules/web/themes/material-blue/views/itemshow/category.inc:16 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:19 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:19 -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:13 #: ../../../modules/web/themes/material-blue/views/itemshow/tag.inc:16 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:29 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:19 #: ../../../modules/web/themes/material-blue/views/itemshow/user_pass.inc:15 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:512 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:528 +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:16 msgid "Nombre" msgstr "Name" @@ -398,8 +402,8 @@ msgstr "Error while searching the group RDN" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:115 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:127 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:137 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:117 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:114 #: ../../../modules/web/Controllers/UserGroupController.php:220 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:137 #: ../../../modules/web/themes/material-blue/views/_partials/footer.inc:15 @@ -407,9 +411,9 @@ msgstr "Error while searching the group RDN" #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:272 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:186 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:213 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:34 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:36 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:39 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:35 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:37 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:40 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:139 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:141 msgid "Grupo" @@ -463,7 +467,7 @@ msgstr "Request" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:74 #: ../../../modules/web/Controllers/ConfigBackupController.php:120 #: ../../../modules/web/Controllers/ConfigManagerController.php:171 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:88 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:86 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:20 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:389 #: ../../../config/actions.xml:13 @@ -476,23 +480,6 @@ msgstr "Accounts" msgid "Notificación" msgstr "Notification" -#: ../../../../lib/SP/Repositories/Account/AccountDefaultPermissionRepository.php:74 -msgid "Error al crear permiso" -msgstr "Error while creating the permission" - -#: ../../../../lib/SP/Repositories/Account/AccountDefaultPermissionRepository.php:111 -msgid "Error al actualizar permiso" -msgstr "Error while updating the permission" - -#: ../../../../lib/SP/Repositories/Account/AccountDefaultPermissionRepository.php:130 -msgid "Error al eliminar permiso" -msgstr "Error while removing the permission" - -#: ../../../../lib/SP/Repositories/Account/AccountDefaultPermissionRepository.php:244 -#: ../../../../lib/SP/Services/Account/AccountDefaultPermissionService.php:187 -msgid "Error al eliminar los permisos" -msgstr "Error while removing the permissions" - #: ../../../../lib/SP/Repositories/Account/AccountFileRepository.php:77 msgid "No se pudo guardar el archivo" msgstr "Error while saving file" @@ -517,7 +504,7 @@ msgstr "Error while deleting the account" #: ../../../../lib/SP/Repositories/Account/AccountHistoryRepository.php:292 #: ../../../../lib/SP/Repositories/Account/AccountRepository.php:455 -#: ../../../../lib/SP/Services/Account/AccountService.php:538 +#: ../../../../lib/SP/Services/Account/AccountService.php:583 msgid "Error al eliminar las cuentas" msgstr "Error while deleting the accounts" @@ -533,7 +520,7 @@ msgid "Error al crear la cuenta" msgstr "Error while creating the account" #: ../../../../lib/SP/Repositories/Account/AccountRepository.php:303 -#: ../../../../lib/SP/Services/Account/AccountService.php:504 +#: ../../../../lib/SP/Services/Account/AccountService.php:549 msgid "Error al restaurar cuenta" msgstr "Error on restoring the account" @@ -678,6 +665,22 @@ msgstr "Error while deleting the field type" msgid "Error al vaciar el registro de eventos" msgstr "Error while clearing the event log" +#: ../../../../lib/SP/Repositories/ItemPreset/ItemPresetRepository.php:76 +msgid "Error al crear permiso" +msgstr "Error while creating the permission" + +#: ../../../../lib/SP/Repositories/ItemPreset/ItemPresetRepository.php:115 +msgid "Error al actualizar permiso" +msgstr "Error while updating the permission" + +#: ../../../../lib/SP/Repositories/ItemPreset/ItemPresetRepository.php:134 +msgid "Error al eliminar permiso" +msgstr "Error while removing the permission" + +#: ../../../../lib/SP/Repositories/ItemPreset/ItemPresetRepository.php:249 +msgid "Error al eliminar los permisos" +msgstr "Error while removing the permissions" + #: ../../../../lib/SP/Repositories/Notification/NotificationRepository.php:78 msgid "Error al crear la notificación" msgstr "Error while adding the notification" @@ -946,11 +949,6 @@ msgstr "Update Master Password (H)" msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "Error while updating the accounts' passwords in history" -#: ../../../../lib/SP/Services/Account/AccountDefaultPermissionService.php:84 -#: ../../../../lib/SP/Services/Account/AccountDefaultPermissionService.php:105 -msgid "Permiso no encontrada" -msgstr "Permission not found" - #: ../../../../lib/SP/Services/Account/AccountFileService.php:145 msgid "Error al eliminar archivos" msgstr "Error while deleting the files" @@ -959,21 +957,21 @@ msgstr "Error while deleting the files" msgid "Archivo no encontrado" msgstr "File not found" -#: ../../../../lib/SP/Services/Account/AccountService.php:92 -#: ../../../../lib/SP/Services/Account/AccountService.php:594 -#: ../../../../lib/SP/Services/Account/AccountService.php:649 -msgid "La cuenta no existe" -msgstr "The account doesn't exist" - -#: ../../../../lib/SP/Services/Account/AccountService.php:179 -#: ../../../../lib/SP/Services/Account/AccountService.php:521 +#: ../../../../lib/SP/Services/Account/AccountService.php:164 +#: ../../../../lib/SP/Services/Account/AccountService.php:566 msgid "Cuenta no encontrada" msgstr "Account not found" -#: ../../../../lib/SP/Services/Account/AccountService.php:230 +#: ../../../../lib/SP/Services/Account/AccountService.php:219 msgid "Clave maestra no establecida" msgstr "Master password not set" +#: ../../../../lib/SP/Services/Account/AccountService.php:282 +#: ../../../../lib/SP/Services/Account/AccountService.php:639 +#: ../../../../lib/SP/Services/Account/AccountService.php:694 +msgid "La cuenta no existe" +msgstr "The account doesn't exist" + #: ../../../../lib/SP/Services/Api/ApiRequest.php:79 #: ../../../../lib/SP/Services/Api/ApiRequest.php:113 #: ../../../../lib/SP/Services/Api/ApiService.php:229 @@ -985,7 +983,7 @@ msgid "Fomato incorrecto" msgstr "Invalid format" #: ../../../../lib/SP/Services/Api/ApiService.php:96 -#: ../../../../lib/SP/Services/Auth/LoginService.php:132 +#: ../../../../lib/SP/Services/Auth/LoginService.php:136 #: ../../../../lib/SP/Services/UserPassRecover/UserPassRecoverService.php:103 #: ../../../modules/web/Controllers/UserPassResetController.php:124 msgid "Intentos excedidos" @@ -1000,34 +998,34 @@ msgstr "Wrong parameters" msgid "Acceso no permitido" msgstr "Unauthorized access" -#: ../../../../lib/SP/Services/Auth/LoginService.php:152 -#: ../../../../lib/SP/Services/Auth/LoginService.php:438 -#: ../../../../lib/SP/Services/Auth/LoginService.php:445 -#: ../../../../lib/SP/Services/Auth/LoginService.php:553 -#: ../../../../lib/SP/Services/Auth/LoginService.php:558 -#: ../../../../lib/SP/Services/Auth/LoginService.php:597 -#: ../../../../lib/SP/Services/Auth/LoginService.php:602 +#: ../../../../lib/SP/Services/Auth/LoginService.php:156 +#: ../../../../lib/SP/Services/Auth/LoginService.php:442 +#: ../../../../lib/SP/Services/Auth/LoginService.php:449 +#: ../../../../lib/SP/Services/Auth/LoginService.php:557 +#: ../../../../lib/SP/Services/Auth/LoginService.php:562 +#: ../../../../lib/SP/Services/Auth/LoginService.php:601 +#: ../../../../lib/SP/Services/Auth/LoginService.php:606 msgid "Login incorrecto" msgstr "Wrong login" -#: ../../../../lib/SP/Services/Auth/LoginService.php:210 -#: ../../../../lib/SP/Services/Auth/LoginService.php:217 +#: ../../../../lib/SP/Services/Auth/LoginService.php:214 +#: ../../../../lib/SP/Services/Auth/LoginService.php:221 msgid "Usuario deshabilitado" msgstr "User disabled" -#: ../../../../lib/SP/Services/Auth/LoginService.php:262 +#: ../../../../lib/SP/Services/Auth/LoginService.php:266 msgid "Usando clave temporal" msgstr "Using temporary password" -#: ../../../../lib/SP/Services/Auth/LoginService.php:270 -#: ../../../../lib/SP/Services/Auth/LoginService.php:276 -#: ../../../../lib/SP/Services/Auth/LoginService.php:289 -#: ../../../../lib/SP/Services/Auth/LoginService.php:295 +#: ../../../../lib/SP/Services/Auth/LoginService.php:274 +#: ../../../../lib/SP/Services/Auth/LoginService.php:280 +#: ../../../../lib/SP/Services/Auth/LoginService.php:293 +#: ../../../../lib/SP/Services/Auth/LoginService.php:299 msgid "Clave maestra incorrecta" msgstr "Wrong master password" -#: ../../../../lib/SP/Services/Auth/LoginService.php:284 -#: ../../../../lib/SP/Services/Auth/LoginService.php:303 +#: ../../../../lib/SP/Services/Auth/LoginService.php:288 +#: ../../../../lib/SP/Services/Auth/LoginService.php:307 #: ../../../../lib/SP/Services/User/UpdatedMasterPassException.php:45 #: ../../../../lib/SP/Util/ErrorUtil.php:144 #: ../../../modules/web/Controllers/ConfigEncryptionController.php:68 @@ -1036,22 +1034,25 @@ msgstr "Wrong master password" msgid "Clave maestra actualizada" msgstr "Master password updated" -#: ../../../../lib/SP/Services/Auth/LoginService.php:309 +#: ../../../../lib/SP/Services/Auth/LoginService.php:313 msgid "Es necesaria su clave anterior" msgstr "Your previous password is needed" -#: ../../../../lib/SP/Services/Auth/LoginService.php:321 +#: ../../../../lib/SP/Services/Auth/LoginService.php:325 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "The Master Password either is not saved or is wrong" -#: ../../../../lib/SP/Services/Auth/LoginService.php:433 -#: ../../../../lib/SP/Services/Auth/LoginService.php:496 -#: ../../../../lib/SP/Services/Auth/LoginService.php:542 -#: ../../../../lib/SP/Services/Auth/LoginService.php:585 +#: ../../../../lib/SP/Services/Auth/LoginService.php:437 +#: ../../../../lib/SP/Services/Auth/LoginService.php:500 +#: ../../../../lib/SP/Services/Auth/LoginService.php:546 +#: ../../../../lib/SP/Services/Auth/LoginService.php:589 #: ../../../modules/web/Controllers/AccountFileController.php:233 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:119 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:117 +#: ../../../modules/web/Controllers/ItemPresetController.php:302 +#: ../../../modules/web/Controllers/ItemPresetController.php:341 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:31 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:33 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:16 @@ -1059,22 +1060,22 @@ msgstr "The Master Password either is not saved or is wrong" msgid "Tipo" msgstr "Type" -#: ../../../../lib/SP/Services/Auth/LoginService.php:434 -#: ../../../../lib/SP/Services/Auth/LoginService.php:497 +#: ../../../../lib/SP/Services/Auth/LoginService.php:438 +#: ../../../../lib/SP/Services/Auth/LoginService.php:501 msgid "Servidor LDAP" msgstr "LDAP Server" -#: ../../../../lib/SP/Services/Auth/LoginService.php:453 -#: ../../../../lib/SP/Services/Auth/LoginService.php:458 +#: ../../../../lib/SP/Services/Auth/LoginService.php:457 +#: ../../../../lib/SP/Services/Auth/LoginService.php:462 msgid "Cuenta expirada" msgstr "Account expired" -#: ../../../../lib/SP/Services/Auth/LoginService.php:466 -#: ../../../../lib/SP/Services/Auth/LoginService.php:471 +#: ../../../../lib/SP/Services/Auth/LoginService.php:470 +#: ../../../../lib/SP/Services/Auth/LoginService.php:475 msgid "El usuario no tiene grupos asociados" msgstr "The user has no associated groups" -#: ../../../../lib/SP/Services/Auth/LoginService.php:587 +#: ../../../../lib/SP/Services/Auth/LoginService.php:591 #: ../../../modules/web/themes/material-blue/views/config/general-auth.inc:10 msgid "Autentificación" msgstr "Authentication" @@ -1235,22 +1236,22 @@ msgstr "Error while updating the custom fields data" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:75 #: ../../../modules/web/Controllers/ConfigBackupController.php:122 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:91 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:89 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:293 msgid "Categorías" msgstr "Categories" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:76 #: ../../../modules/web/Controllers/ConfigBackupController.php:121 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:88 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:325 msgid "Clientes" msgstr "Clients" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:77 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:102 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:13 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:118 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:99 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:14 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:4 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:47 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:50 @@ -1259,9 +1260,9 @@ msgid "Usuarios" msgstr "Users" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:78 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:93 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:51 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:157 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:90 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:52 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:43 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:261 msgid "Grupos" msgstr "Groups" @@ -1375,10 +1376,10 @@ msgstr "Account imported" #: ../../../modules/web/Controllers/ClientController.php:245 #: ../../../modules/web/Controllers/ClientController.php:281 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:214 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:99 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:100 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:104 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:33 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:39 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:47 @@ -1473,8 +1474,8 @@ msgstr "Category imported" #: ../../../modules/web/Controllers/CategoryController.php:249 #: ../../../modules/web/Controllers/CategoryController.php:289 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:228 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:100 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:101 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:62 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:64 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:38 @@ -1707,6 +1708,15 @@ msgstr "Error while checking the database" msgid "Intente de nuevo la instalación" msgstr "Please, try the installation again" +#: ../../../../lib/SP/Services/ItemPreset/ItemPresetService.php:84 +#: ../../../../lib/SP/Services/ItemPreset/ItemPresetService.php:105 +msgid "Valor no encontrada" +msgstr "Value not found" + +#: ../../../../lib/SP/Services/ItemPreset/ItemPresetService.php:188 +msgid "Error al eliminar los valores" +msgstr "Error while deleting the values" + #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:106 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:188 msgid "Objetos encontrados" @@ -1836,8 +1846,8 @@ msgid "Error al aplicar la actualización de la aplicación" msgstr "Error while applying the application update" #: ../../../../lib/SP/Services/Upgrade/UpgradeAppService.php:71 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:89 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:97 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:90 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:98 msgid "Compruebe el registro de eventos para más detalles" msgstr "Please, check the event log for more details" @@ -1873,10 +1883,10 @@ msgstr "Parameter" #: ../../../../lib/SP/Services/Upgrade/UpgradeConfigService.php:113 #: ../../../../lib/SP/Services/Upgrade/UpgradeConfigService.php:229 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:164 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:165 #: ../../../modules/web/Controllers/ConfigBackupController.php:118 #: ../../../modules/web/themes/material-blue/views/config/info.inc:40 -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:25 +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:28 msgid "Versión" msgstr "Version" @@ -1919,27 +1929,27 @@ msgstr "Field updated" msgid "Campo" msgstr "Field" -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:80 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:123 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:81 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:124 msgid "Actualizar BBDD" msgstr "Update DB" -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:87 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:88 msgid "Error al aplicar la actualización auxiliar" msgstr "Error while applying an auxiliary update" -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:95 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:177 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:181 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:96 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:178 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:182 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "Error while updating the database" -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:155 -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:157 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:156 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:158 msgid "El archivo de actualización no contiene datos" msgstr "The update file does not contain data" -#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:187 +#: ../../../../lib/SP/Services/Upgrade/UpgradeDatabaseService.php:188 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Database updating was completed successfully." @@ -2119,13 +2129,6 @@ msgid "Opción no disponible" msgstr "Option unavailable" #: ../../../../lib/SP/Util/ErrorUtil.php:140 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:68 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:142 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:177 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:208 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:238 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:277 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:313 #: ../../../modules/web/Controllers/AccountFileController.php:259 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:59 #: ../../../modules/web/Controllers/AccountManagerController.php:57 @@ -2158,6 +2161,13 @@ msgstr "Option unavailable" #: ../../../modules/web/Controllers/CustomFieldController.php:258 #: ../../../modules/web/Controllers/CustomFieldController.php:295 #: ../../../modules/web/Controllers/EventlogController.php:94 +#: ../../../modules/web/Controllers/ItemPresetController.php:67 +#: ../../../modules/web/Controllers/ItemPresetController.php:145 +#: ../../../modules/web/Controllers/ItemPresetController.php:180 +#: ../../../modules/web/Controllers/ItemPresetController.php:218 +#: ../../../modules/web/Controllers/ItemPresetController.php:248 +#: ../../../modules/web/Controllers/ItemPresetController.php:287 +#: ../../../modules/web/Controllers/ItemPresetController.php:326 #: ../../../modules/web/Controllers/NotificationController.php:100 #: ../../../modules/web/Controllers/NotificationController.php:160 #: ../../../modules/web/Controllers/NotificationController.php:175 @@ -2166,7 +2176,7 @@ msgstr "Option unavailable" #: ../../../modules/web/Controllers/NotificationController.php:288 #: ../../../modules/web/Controllers/NotificationController.php:315 #: ../../../modules/web/Controllers/NotificationController.php:348 -#: ../../../modules/web/Controllers/PluginController.php:97 +#: ../../../modules/web/Controllers/PluginController.php:98 #: ../../../modules/web/Controllers/PluginController.php:117 #: ../../../modules/web/Controllers/PublicLinkController.php:68 #: ../../../modules/web/Controllers/PublicLinkController.php:100 @@ -2255,8 +2265,8 @@ msgstr "Account displayed" #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:111 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:146 #: ../../../modules/web/Controllers/AccountManagerController.php:114 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:103 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:15 #: ../../../modules/web/themes/material-blue/views/account/account.inc:24 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:16 @@ -2278,10 +2288,10 @@ msgstr "Account" #: ../../../modules/api/Controllers/ClientController.php:126 #: ../../../modules/api/Controllers/ClientController.php:155 #: ../../../modules/api/Controllers/TagController.php:118 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:260 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:290 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:326 #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:100 +#: ../../../modules/web/Controllers/ItemPresetController.php:270 +#: ../../../modules/web/Controllers/ItemPresetController.php:303 +#: ../../../modules/web/Controllers/ItemPresetController.php:342 #: ../../../modules/web/themes/material-blue/views/account/details.inc:138 #: ../../../modules/web/themes/material-blue/views/account/details.inc:140 msgid "ID" @@ -2510,14 +2520,16 @@ msgstr "Notes about the account" #: ../../../modules/api/Controllers/Help/AccountHelp.php:89 #: ../../../modules/api/Controllers/Help/AccountHelp.php:111 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:126 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:130 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:106 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:19 msgid "Cuenta Privada" msgstr "Private Account" #: ../../../modules/api/Controllers/Help/AccountHelp.php:90 #: ../../../modules/api/Controllers/Help/AccountHelp.php:112 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:139 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:146 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:38 msgid "Cuenta Privada Grupo" msgstr "Private Account for Group" @@ -2586,8 +2598,8 @@ msgid "Descripción del cliente" msgstr "Client description" #: ../../../modules/api/Controllers/Help/ClientHelp.php:56 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:144 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:142 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:62 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:92 msgid "Global" @@ -2632,7 +2644,7 @@ msgstr "Tag updated" msgid "Etiqueta eliminada" msgstr "Tag removed" -#: ../../../modules/api/Init.php:139 +#: ../../../modules/api/Init.php:132 msgid "Es necesario actualizar" msgstr "Updating needed" @@ -2661,7 +2673,7 @@ msgstr "HTTPS" #. (itstool) path: action/text #: ../../../modules/web/Controllers/AccountController.php:253 #: ../../../modules/web/Controllers/AccountController.php:297 -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:275 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:276 #: ../../../config/actions.xml:151 msgid "Nueva Cuenta" msgstr "New Account" @@ -2679,10 +2691,10 @@ msgstr "Edit Account" #: ../../../modules/web/Controllers/AccountController.php:386 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:312 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:313 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:147 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:148 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:175 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:145 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:146 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:173 #: ../../../config/actions.xml:163 ../../../config/actions.xml:481 #: ../../../config/actions.xml:781 msgid "Eliminar Cuenta" @@ -2725,11 +2737,11 @@ msgid "Solicitante" msgstr "Requester" #: ../../../modules/web/Controllers/AccountController.php:901 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:101 #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:106 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:121 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:119 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:103 #: ../../../modules/web/themes/material-blue/views/itemshow/category.inc:28 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:32 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:32 @@ -2742,48 +2754,6 @@ msgstr "Description" msgid "Solicitud realizada" msgstr "Request done" -#. (itstool) path: action/text -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:71 -#: ../../../config/actions.xml:847 -msgid "Ver Permiso" -msgstr "View Permission" - -#. (itstool) path: action/text -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:181 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:156 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:157 -#: ../../../config/actions.xml:853 -msgid "Nuevo Permiso" -msgstr "New Permission" - -#. (itstool) path: action/text -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:211 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:174 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:175 -#: ../../../config/actions.xml:859 -msgid "Editar Permiso" -msgstr "Edit Permission" - -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:248 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:251 -msgid "Permisos eliminados" -msgstr "Permissions deleted" - -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:259 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:263 -msgid "Permiso eliminado" -msgstr "Permission deleted" - -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:289 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:293 -msgid "Permiso creado" -msgstr "Permission added" - -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:325 -#: ../../../modules/web/Controllers/AccountDefaultPermissionController.php:329 -msgid "Permiso actualizado" -msgstr "Permission updated" - #: ../../../modules/web/Controllers/AccountFavoriteController.php:55 msgid "Favorito añadido" msgstr "Favorite added" @@ -2853,7 +2823,7 @@ msgid "Archivo guardado" msgstr "File saved" #: ../../../modules/web/Controllers/AccountFileController.php:234 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 msgid "Tamaño" msgstr "Size" @@ -2879,14 +2849,14 @@ msgid "No hay archivos asociados a la cuenta" msgstr "There are no linked files for the account" #: ../../../modules/web/Controllers/AuthTokenController.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:153 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:151 msgid "Nueva Autorización" msgstr "New Authorization" #: ../../../modules/web/Controllers/AuthTokenController.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:188 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:189 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:186 msgid "Editar Autorización" msgstr "Edit Authorization" @@ -2914,8 +2884,8 @@ msgstr "Authorization viewed" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:99 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:149 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:147 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:148 #: ../../../modules/web/themes/material-blue/views/account/account.inc:110 #: ../../../config/actions.xml:301 msgid "Nueva Categoría" @@ -2923,8 +2893,8 @@ msgstr "New Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:162 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:167 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:165 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:166 #: ../../../config/actions.xml:307 msgid "Editar Categoría" msgstr "Edit Category" @@ -2942,8 +2912,8 @@ msgstr "View Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:152 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:153 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:151 #: ../../../modules/web/themes/material-blue/views/account/account.inc:86 #: ../../../config/actions.xml:331 msgid "Nuevo Cliente" @@ -2951,8 +2921,8 @@ msgstr "New Client" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:163 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:170 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:171 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:169 #: ../../../config/actions.xml:337 msgid "Editar Cliente" msgstr "Edit Client" @@ -3012,7 +2982,7 @@ msgid "Verificación de datos exportados finalizada" msgstr "Verification of exported data finished" #: ../../../modules/web/Controllers/ConfigBackupController.php:119 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:124 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:123 #: ../../../modules/web/themes/material-blue/views/common/aux-customfields.inc:13 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:86 msgid "Encriptado" @@ -3029,7 +2999,7 @@ msgid "No" msgstr "No" #: ../../../modules/web/Controllers/ConfigBackupController.php:123 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:91 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:89 #: ../../../modules/web/themes/material-blue/views/account/account.inc:203 #: ../../../modules/web/themes/material-blue/views/account/account.inc:205 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:309 @@ -3205,7 +3175,7 @@ msgstr "Please, check your inbox" #: ../../../modules/web/Controllers/ConfigManagerController.php:157 #: ../../../modules/web/themes/material-blue/views/install/index.inc:131 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:425 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:441 msgid "General" msgstr "General" @@ -3226,7 +3196,7 @@ msgid "Correo" msgstr "Mail" #: ../../../modules/web/Controllers/ConfigManagerController.php:268 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:441 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:457 msgid "Encriptación" msgstr "Encryption" @@ -3263,7 +3233,7 @@ msgid "No instalado" msgstr "Not installed" #: ../../../modules/web/Controllers/ConfigManagerController.php:361 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:65 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:63 msgid "Información" msgstr "Information" @@ -3292,14 +3262,14 @@ msgid "DokuWiki deshabilitada" msgstr "DokuWiki disabled" #: ../../../modules/web/Controllers/CustomFieldController.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:154 #: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:156 msgid "Nuevo Campo" msgstr "New Field" #: ../../../modules/web/Controllers/CustomFieldController.php:162 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:172 #: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:173 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:174 msgid "Editar Campo" msgstr "Edit Field" @@ -3373,7 +3343,7 @@ msgstr "Restore account from this point" #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:237 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:238 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:53 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:51 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:121 msgid "Guardar" msgstr "Save" @@ -3397,7 +3367,7 @@ msgstr "Create Public Link" #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:374 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:418 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:419 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:36 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:34 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:64 #: ../../../config/actions.xml:169 ../../../config/actions.xml:259 msgid "Ver Clave" @@ -3458,69 +3428,37 @@ msgstr "URL / IP" msgid "Ordenar por URL / IP" msgstr "Sort by URL / IP" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:90 -msgid "Permisos por Defecto" -msgstr "Default Permissions" - -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:116 -#: ../../../modules/web/Controllers/UserProfileController.php:216 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:51 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:53 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:56 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:122 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:124 -msgid "Perfil" -msgstr "Profile" - -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:105 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:69 -msgid "Prioridad" -msgstr "Priority" - -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:106 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:105 -msgid "Forzado" -msgstr "Forced" - -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:124 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:120 -#: ../../../config/strings.js.inc:66 -msgid "SI" -msgstr "YES" - -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:124 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:120 -#: ../../../config/strings.js.inc:67 -msgid "NO" -msgstr "NO" +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:67 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:68 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:69 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:69 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:83 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:80 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:71 +msgid "Eliminar Seleccionados" +msgstr "Delete Selected" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:141 -#: ../../../config/actions.xml:841 -msgid "Buscar Permiso" -msgstr "Search for Permission" - -#. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:191 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountDefaultPermissionGrid.php:192 -#: ../../../config/actions.xml:865 -msgid "Eliminar Permiso" -msgstr "Delete Permission" - -#. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:132 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:143 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:130 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:140 #: ../../../config/actions.xml:487 ../../../config/actions.xml:787 msgid "Buscar Cuenta" msgstr "Search for Account" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:87 msgid "Cuentas (H)" msgstr "Accounts (H)" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:116 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:98 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:112 #: ../../../modules/web/themes/material-blue/views/account/account.inc:182 @@ -3530,101 +3468,111 @@ msgstr "Accounts (H)" msgid "Fecha" msgstr "Date" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:106 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:122 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:120 #: ../../../modules/web/Controllers/Helpers/Grid/PluginGrid.php:102 msgid "Estado" msgstr "Status" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:127 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:124 msgid "Modificada" msgstr "Modified" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:128 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:125 msgid "Eliminada" msgstr "Removed" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:158 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:155 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:156 #: ../../../config/actions.xml:181 ../../../config/actions.xml:793 msgid "Restaurar Cuenta" msgstr "Account Restore" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:93 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:90 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:357 msgid "Autorizaciones API" msgstr "API Authorizations" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:138 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:135 msgid "Buscar Token" msgstr "Search for Token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:171 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:169 msgid "Ver token de Autorización" msgstr "View Authorization token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:205 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:206 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:203 msgid "Eliminar Autorización" msgstr "Delete Authorization" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:134 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:132 #: ../../../config/actions.xml:319 msgid "Buscar Categoría" msgstr "Search for Category" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:184 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:182 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:183 #: ../../../config/actions.xml:313 msgid "Eliminar Categoría" msgstr "Delete Category" +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../config/strings.js.inc:66 +msgid "SI" +msgstr "YES" + +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../config/strings.js.inc:67 +msgid "NO" +msgstr "NO" + #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:137 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:135 #: ../../../config/actions.xml:349 msgid "Buscar Cliente" msgstr "Search for Client" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:187 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:188 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:186 #: ../../../config/actions.xml:343 msgid "Eliminar Cliente" msgstr "Delete Client" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:91 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:90 #: ../../../modules/web/themes/material-blue/views/account/account.inc:27 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:341 msgid "Campos Personalizados" msgstr "Custom Fields" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:103 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:47 msgid "Módulo" msgstr "Module" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:106 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 msgid "Propiedades" msgstr "Properties" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:139 msgid "Buscar Campo" msgstr "Search for Field" +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:189 #: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:190 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:191 msgid "Eliminar Campo" msgstr "Delete Field" #. (itstool) path: action/text #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:88 -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:331 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:318 #: ../../../modules/web/themes/material-blue/views/eventlog/index.inc:1 #: ../../../config/actions.xml:127 msgid "Registro de Eventos" @@ -3643,7 +3591,7 @@ msgid "Evento" msgstr "Event" #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:112 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/user_pass.inc:26 msgid "Login" @@ -3668,7 +3616,7 @@ msgid "Vaciar registro de eventos" msgstr "Clear event log" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:89 #: ../../../modules/web/themes/material-blue/views/account/account.inc:35 #: ../../../modules/web/themes/material-blue/views/config/accounts.inc:277 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:145 @@ -3678,103 +3626,175 @@ msgid "Archivos" msgstr "Files" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:141 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:140 #: ../../../config/actions.xml:469 msgid "Buscar Archivo" msgstr "Search for File" #. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:155 #: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:156 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:157 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:45 #: ../../../config/actions.xml:199 ../../../config/actions.xml:445 msgid "Ver Archivo" msgstr "View File" #. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:172 #: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:173 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:174 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:38 #: ../../../config/actions.xml:211 ../../../config/actions.xml:451 msgid "Descargar Archivo" msgstr "Download File" #. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:189 #: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:190 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:191 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:30 #: ../../../config/actions.xml:217 ../../../config/actions.xml:457 msgid "Eliminar Archivo" msgstr "Delete File" +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:93 +msgid "Valores Predeterminados" +msgstr "Preset Values" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:113 +#: ../../../modules/web/Controllers/UserProfileController.php:216 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:52 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:54 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:57 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:122 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:124 +msgid "Perfil" +msgstr "Profile" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:109 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:70 +msgid "Prioridad" +msgstr "Priority" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:110 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:106 +msgid "Forzado" +msgstr "Forced" + #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:105 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:67 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:144 +#: ../../../config/actions.xml:841 +msgid "Buscar Valor" +msgstr "Search for Value" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:159 +msgid "Valor de Permiso" +msgstr "Permission Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:160 +msgid "Nuevo Valor de Permiso" +msgstr "New Permission Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:183 +msgid "Valor de Cuenta Privada" +msgstr "Private Account Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:184 +msgid "Nuevo Valor de Cuenta Privada" +msgstr "New Private Account Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:207 +msgid "Valor de Timeout de Sesión" +msgstr "Session Timeout Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:208 +msgid "Nuevo Valor de Timeout de Sesión" +msgstr "New Session Timeout Preset" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:231 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:232 +#: ../../../modules/web/Controllers/ItemPresetController.php:221 +#: ../../../config/actions.xml:859 +msgid "Editar Valor" +msgstr "Edit Value" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:248 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:249 +#: ../../../config/actions.xml:865 +msgid "Eliminar Valor" +msgstr "Delete Value" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:103 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:65 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:105 #: ../../../modules/web/themes/material-blue/views/notification/index.inc:1 #: ../../../config/actions.xml:667 msgid "Notificaciones" msgstr "Notifications" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:120 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:118 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:28 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:35 msgid "Componente" msgstr "Component" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:142 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:140 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:104 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:108 msgid "Leída" msgstr "Read" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:143 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:141 msgid "Sólo Admins" msgstr "Only Admins" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:160 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:158 #: ../../../config/actions.xml:829 msgid "Buscar Notificación" msgstr "Search for Notification" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:175 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:174 #: ../../../modules/web/Controllers/NotificationController.php:179 msgid "Nueva Notificación" msgstr "New Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:193 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:194 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:191 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:192 #: ../../../modules/web/Controllers/NotificationController.php:103 #: ../../../config/actions.xml:799 msgid "Ver Notificación" msgstr "View Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:223 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:224 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:221 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:222 #: ../../../config/actions.xml:823 msgid "Marcar Notificación" msgstr "Checkout Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:241 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:242 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:239 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:240 #: ../../../modules/web/Controllers/NotificationController.php:210 #: ../../../config/actions.xml:811 msgid "Editar Notificación" msgstr "Edit Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:258 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:259 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:256 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:257 #: ../../../config/actions.xml:817 msgid "Eliminar Notificación" msgstr "Delete Notification" #: ../../../modules/web/Controllers/Helpers/Grid/PluginGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:332 +#: ../../../modules/web/themes/material-blue/views/plugin/index.inc:1 msgid "Plugins" msgstr "Plugins" @@ -3815,32 +3835,32 @@ msgstr "Disable" msgid "Restablecer Datos" msgstr "Reset Data" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:93 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:91 #: ../../../modules/web/themes/material-blue/views/account/account.inc:43 msgid "Enlaces" msgstr "Links" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:105 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:46 msgid "Fecha Creación" msgstr "Creation Date" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:106 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:182 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:52 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:54 msgid "Fecha Caducidad" msgstr "Expiry Date " -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:110 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:31 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:34 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:38 msgid "Notificar" msgstr "Notify" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:111 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 #: ../../../modules/web/themes/material-blue/views/account/details.inc:9 #: ../../../modules/web/themes/material-blue/views/account/details.inc:11 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:184 @@ -3849,102 +3869,102 @@ msgstr "Notify" msgid "Visitas" msgstr "Visits" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:146 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:144 msgid "Buscar Enlace" msgstr "Search for Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:161 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:162 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:160 msgid "Nuevo Enlace" msgstr "New Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:179 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:180 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:177 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:178 #: ../../../modules/web/Controllers/PublicLinkController.php:336 msgid "Ver Enlace" msgstr "View Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:195 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:196 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:193 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:194 msgid "Renovar Enlace" msgstr "Renew Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:212 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:213 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:210 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:211 msgid "Eliminar Enlace" msgstr "Delete Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:132 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:130 #: ../../../config/actions.xml:517 msgid "Buscar Etiqueta" msgstr "Search for Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:147 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:148 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:145 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:146 #: ../../../modules/web/Controllers/TagController.php:98 #: ../../../config/actions.xml:493 msgid "Nueva Etiqueta" msgstr "New Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:166 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:163 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:164 #: ../../../modules/web/Controllers/TagController.php:157 #: ../../../config/actions.xml:505 msgid "Editar Etiqueta" msgstr "Edit Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:182 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:183 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:180 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:181 #: ../../../config/actions.xml:511 msgid "Eliminar Etiqueta" msgstr "Delete Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:151 #: ../../../config/actions.xml:589 msgid "Buscar Usuario" msgstr "Search for User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:169 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:166 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:167 #: ../../../modules/web/Controllers/UserController.php:105 #: ../../../config/actions.xml:565 msgid "Nuevo Usuario" msgstr "New User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:187 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:188 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:184 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:185 #: ../../../modules/web/Controllers/UserController.php:190 #: ../../../config/actions.xml:571 msgid "Editar Usuario" msgstr "Edit User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:204 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:205 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:201 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:202 #: ../../../config/actions.xml:577 msgid "Eliminar Usuario" msgstr "Delete User" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:222 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:218 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:219 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:440 msgid "Importar usuarios de LDAP" msgstr "Import users from LDAP" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:236 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:237 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:233 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:234 msgid "Ver Detalles de Usuario" msgstr "View User Details" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:253 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:254 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:250 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:251 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:62 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:120 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:126 @@ -3952,101 +3972,101 @@ msgid "Cambiar Clave de Usuario" msgstr "Change User's Password" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:136 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:133 #: ../../../config/actions.xml:619 msgid "Buscar Grupo" msgstr "Search for Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:151 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:152 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:148 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:149 #: ../../../modules/web/Controllers/UserGroupController.php:106 #: ../../../config/actions.xml:601 msgid "Nuevo Grupo" msgstr "New Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:169 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:166 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:167 #: ../../../modules/web/Controllers/UserGroupController.php:319 #: ../../../config/actions.xml:595 msgid "Ver Grupo" msgstr "View Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:186 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:187 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:183 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:184 #: ../../../modules/web/Controllers/UserGroupController.php:171 #: ../../../config/actions.xml:607 msgid "Editar Grupo" msgstr "Edit Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:203 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:204 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:200 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:201 #: ../../../config/actions.xml:613 msgid "Eliminar Grupo" msgstr "Delete Group" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:93 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:90 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:277 msgid "Perfiles" msgstr "Profiles" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:134 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:131 #: ../../../config/actions.xml:649 msgid "Buscar Perfil" msgstr "Search for Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:149 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:146 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:147 #: ../../../modules/web/Controllers/UserProfileController.php:100 #: ../../../config/actions.xml:631 msgid "Nuevo Perfil" msgstr "New Profile" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:167 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:164 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:165 msgid "Ver Detalles de Perfil" msgstr "View Profile Details" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:184 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:181 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:182 #: ../../../modules/web/Controllers/UserProfileController.php:166 #: ../../../config/actions.xml:637 msgid "Editar Perfil" msgstr "Edit Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:201 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:198 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:199 #: ../../../config/actions.xml:643 msgid "Eliminar Perfil" msgstr "Delete Profile" -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:262 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:60 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:263 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:58 msgid "Buscar" msgstr "Search" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:289 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:290 #: ../../../config/actions.xml:103 msgid "Usuarios y Accesos" msgstr "Users and Accesses" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:303 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:304 #: ../../../config/actions.xml:43 msgid "Elementos y Personalización" msgstr "Items and Customizations" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:317 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:63 +#: ../../../modules/web/Controllers/Helpers/LayoutHelper.php:346 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:61 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:21 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:22 #: ../../../config/actions.xml:673 @@ -4065,6 +4085,38 @@ msgstr "Without this module the application could not run correctly" msgid "Instalación finalizada" msgstr "Installation finished" +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/ItemPresetController.php:70 +#: ../../../config/actions.xml:847 +msgid "Ver Valor" +msgstr "Display Value" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/ItemPresetController.php:191 +#: ../../../config/actions.xml:853 +msgid "Nuevo Valor" +msgstr "New Value" + +#: ../../../modules/web/Controllers/ItemPresetController.php:258 +#: ../../../modules/web/Controllers/ItemPresetController.php:261 +msgid "Valores eliminados" +msgstr "Values deleted" + +#: ../../../modules/web/Controllers/ItemPresetController.php:269 +#: ../../../modules/web/Controllers/ItemPresetController.php:273 +msgid "Valor eliminado" +msgstr "Value deleted" + +#: ../../../modules/web/Controllers/ItemPresetController.php:301 +#: ../../../modules/web/Controllers/ItemPresetController.php:306 +msgid "Valor creado" +msgstr "Value created" + +#: ../../../modules/web/Controllers/ItemPresetController.php:340 +#: ../../../modules/web/Controllers/ItemPresetController.php:345 +msgid "Valor actualizado" +msgstr "Value updated" + #: ../../../modules/web/Controllers/LoginController.php:101 msgid "Finalizar sesión" msgstr "Logout session" @@ -4102,18 +4154,18 @@ msgstr "Notification created" msgid "Notificación actualizada" msgstr "Notification updated" -#: ../../../modules/web/Controllers/PluginController.php:179 -#: ../../../modules/web/Controllers/PluginController.php:182 +#: ../../../modules/web/Controllers/PluginController.php:181 +#: ../../../modules/web/Controllers/PluginController.php:184 msgid "Plugin habilitado" msgstr "Plugin enabled" -#: ../../../modules/web/Controllers/PluginController.php:204 -#: ../../../modules/web/Controllers/PluginController.php:207 +#: ../../../modules/web/Controllers/PluginController.php:206 +#: ../../../modules/web/Controllers/PluginController.php:209 msgid "Plugin deshabilitado" msgstr "Plugin disabled" -#: ../../../modules/web/Controllers/PluginController.php:229 -#: ../../../modules/web/Controllers/PluginController.php:232 +#: ../../../modules/web/Controllers/PluginController.php:231 +#: ../../../modules/web/Controllers/PluginController.php:234 msgid "Plugin restablecido" msgstr "Plugin reset" @@ -4295,14 +4347,6 @@ msgstr "Preferences updated" msgid "Preferencias" msgstr "Preferences" -#: ../../../modules/web/Forms/AccountDefaultPermissionForm.php:111 -msgid "Es necesario asignar un elemento del tipo usuario, grupo o perfil" -msgstr "An element of type user, group or profile need to be set" - -#: ../../../modules/web/Forms/AccountDefaultPermissionForm.php:115 -msgid "No hay permisos definidos" -msgstr "There aren't any defined permissions" - #: ../../../modules/web/Forms/AccountForm.php:139 msgid "Es necesaria una clave" msgstr "A key is needed" @@ -4348,6 +4392,18 @@ msgstr "Field type not set" msgid "Módulo del campo no indicado" msgstr "Field module not set" +#: ../../../modules/web/Forms/ItemsPresetForm.php:111 +msgid "Tipo de valor no definido o incorrecto" +msgstr "Value type not set or incorrect" + +#: ../../../modules/web/Forms/ItemsPresetForm.php:128 +msgid "No hay permisos definidos" +msgstr "There aren't any defined permissions" + +#: ../../../modules/web/Forms/ItemsPresetForm.php:173 +msgid "Es necesario asignar un elemento del tipo usuario, grupo o perfil" +msgstr "An element of type user, group or profile need to be set" + #: ../../../modules/web/Forms/NotificationForm.php:92 msgid "Es necesario un componente" msgstr "A component is needed" @@ -4396,76 +4452,76 @@ msgstr "Unable to delete, user in use" msgid "Es necesario un nombre de grupo" msgstr "A group name is needed" -#: ../../../modules/web/Forms/UserProfileForm.php:115 +#: ../../../modules/web/Forms/UserProfileForm.php:116 msgid "Es necesario un nombre de perfil" msgstr "A profile name is needed" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:34 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:32 msgid "Añadir" msgstr "Add" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:35 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:33 msgid "Ver Detalles" msgstr "View Details" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:37 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:33 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:71 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:138 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:177 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:35 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:34 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:72 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:24 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:63 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:97 msgid "Editar" msgstr "Edit" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:38 -#: ../../../modules/web/themes/material-blue/inc/Icons.php:68 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:36 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:66 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:129 msgid "Eliminar" msgstr "Delete" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:39 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:37 msgid "Cambiar Clave" msgstr "Change Password" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:40 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:38 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:193 msgid "Admin Aplicación" msgstr "Application Admin" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:41 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:39 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:211 msgid "Admin Cuentas" msgstr "Accounts Admin" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:42 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:40 msgid "Usuario de LDAP" msgstr "LDAP User" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:43 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:41 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:250 msgid "Deshabilitado" msgstr "Disabled" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:44 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:42 msgid "Habilitado" msgstr "Enabled" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:45 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:43 #: ../../../modules/web/themes/material-blue/views/main/upgrade.inc:174 #: ../../../modules/web/themes/material-blue/views/upgrade/index.inc:49 msgid "Actualizar" msgstr "Update" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:46 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:44 msgid "Copiar" msgstr "Copy" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:48 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:46 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:78 msgid "Email" msgstr "Email" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:51 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:49 #: ../../../modules/web/themes/material-blue/views/_partials/error.inc:14 #: ../../../modules/web/themes/material-blue/views/_partials/error.inc:15 #: ../../../modules/web/themes/material-blue/views/error/error-database.inc:13 @@ -4477,53 +4533,53 @@ msgstr "Email" msgid "Volver" msgstr "Back" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:52 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:50 msgid "Restaurar" msgstr "Restore" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:54 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:52 #: ../../../config/strings.js.inc:79 msgid "Ayuda" msgstr "Help" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:55 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:53 msgid "Limpiar" msgstr "Clear" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:56 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:54 msgid "Realizar" msgstr "Perform" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:57 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:55 msgid "Descargar" msgstr "Download" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:58 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:56 #: ../../../config/strings.js.inc:85 msgid "Aviso" msgstr "Warning" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:59 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:57 msgid "Comprobar" msgstr "Check" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:66 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:64 msgid "Crítico" msgstr "Critical" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:71 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:67 msgid "Página anterior" msgstr "Previous page" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:72 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:68 msgid "Página siguiente" msgstr "Next page" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:73 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:69 msgid "Primera página" msgstr "First page" -#: ../../../modules/web/themes/material-blue/inc/Icons.php:74 +#: ../../../modules/web/themes/material-blue/inc/Icons.php:70 msgid "Última página" msgstr "Last page" @@ -4606,29 +4662,29 @@ msgid "Vaciar el registro de eventos?" msgstr "Clear event log?" #: ../../../config/strings.js.inc:47 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:112 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:113 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:276 #: ../../../modules/web/themes/material-blue/views/config/general-auth.inc:87 #: ../../../modules/web/themes/material-blue/views/config/import.inc:57 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:233 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:40 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:41 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:145 msgid "Seleccionar Grupo" msgstr "Select Group" #: ../../../config/strings.js.inc:48 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:95 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:96 #: ../../../modules/web/themes/material-blue/views/config/general-auth.inc:112 #: ../../../modules/web/themes/material-blue/views/config/import.inc:30 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:258 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:23 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:21 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:24 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:74 msgid "Seleccionar Usuario" msgstr "Select User" #: ../../../config/strings.js.inc:49 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:57 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:58 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:128 msgid "Seleccionar Perfil" msgstr "Select Profile" @@ -4921,47 +4977,47 @@ msgstr "Select date" msgid "Última Modificación" msgstr "Last Modification" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:17 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:55 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:122 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:161 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:18 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:56 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:8 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:47 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:48 msgid "Ver" msgstr "View" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:21 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:37 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:126 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:142 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:22 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:38 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:12 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:28 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:51 msgid "Seleccionar Usuarios" msgstr "Select Users" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:59 -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:75 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:165 -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:181 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:60 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:76 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:51 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:67 msgid "Seleccionar Grupos" msgstr "Select Groups" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:92 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:93 #: ../../../modules/web/themes/material-blue/views/account/details.inc:37 #: ../../../modules/web/themes/material-blue/views/account/details.inc:39 msgid "Creador" msgstr "Creator" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:109 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:110 #: ../../../modules/web/themes/material-blue/views/account/details.inc:45 #: ../../../modules/web/themes/material-blue/views/account/details.inc:47 msgid "Grupo Principal" msgstr "Main Group" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:131 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:135 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:177 msgid "Privada" msgstr "Private" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:144 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:151 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:193 msgid "Privada Grupo" msgstr "Private for Group" @@ -5665,8 +5721,8 @@ msgstr "Sets the default profile for the newly created SSO users." #: ../../../modules/web/themes/material-blue/views/config/general-events.inc:99 #: ../../../modules/web/themes/material-blue/views/config/mail.inc:171 #: ../../../modules/web/themes/material-blue/views/config/mail.inc:174 -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:61 -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:63 +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:64 +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:66 msgid "Eventos" msgstr "Events" @@ -6307,10 +6363,6 @@ msgstr "Namespace used to search pages." msgid "Instalar" msgstr "Install" -#: ../../../modules/web/themes/material-blue/views/grid/datagrid-grid.inc:97 -msgid "Eliminar Seleccionados" -msgstr "Delete Selected" - #: ../../../modules/web/themes/material-blue/views/grid/datagrid-nav-full.inc:11 msgid "Filtro ON" msgstr "Filter ON" @@ -6372,28 +6424,6 @@ msgstr "Hosting Mode" msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "It does not create or verify the user's permissions on the DB" -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:75 -msgid "" -"Prioridad de asignación en caso de coincidir con otros permisos asignados " -"por usuario, grupo o perfil." -msgstr "" -"Assignment priority if permissions match with others assigned by user, group " -"or profile." - -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:86 -msgid "Prioridad de asignación" -msgstr "Assignment Priority" - -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:107 -msgid "Indica si los permisos serán forzados al crear o modificar la cuenta." -msgstr "" -"Enforces the permissions to be set either on creating or updating an " -"account ." - -#: ../../../modules/web/themes/material-blue/views/itemshow/account_default_permission.inc:109 -msgid "Los permisos serán añadidos a los existentes." -msgstr "Permissions will be merged with the existing ones." - #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:58 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:12 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:85 @@ -6438,30 +6468,49 @@ msgstr "Field help" msgid "Obligatorio" msgstr "Required" -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:20 -msgid "Nombre del plugin" -msgstr "Plugin name" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:21 +msgid "Las cuentas sólo serán visibles por el usuario." +msgstr "Accounts will be only visible by the user." -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:32 -msgid "Versión del plugin" -msgstr "Plugin version" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:23 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:42 +msgid "Los administradores no podrán acceder a las cuentas." +msgstr "Administrators won't be able to display the accounts." -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:37 -msgid "Versión Compatible" -msgstr "Compatible Version" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-private.inc:40 +msgid "Las cuentas sólo serán visibles por el usuario y su grupo principal." +msgstr "Accounts will be only visible by the user and his/her main group." -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:44 -msgid "Versión de sysPass compatible" -msgstr "sysPass compatible version" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:6 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:14 +msgid "Dirección IP" +msgstr "IP Address" -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:49 -#: ../../../modules/web/themes/material-blue/views/wiki/wikipage.inc:25 -msgid "Autor" -msgstr "Author" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:19 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:27 +msgid "Timeout" +msgstr "Timeout" -#: ../../../modules/web/themes/material-blue/views/itemshow/plugin.inc:56 -msgid "Autor del plugin" -msgstr "Plugin author" +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:76 +msgid "" +"Prioridad de asignación en caso de coincidir con otros valores asignados por " +"usuario, grupo o perfil." +msgstr "" +"Assignment priority if values match with others assigned by user, group or " +"profile." + +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:87 +msgid "Prioridad de asignación" +msgstr "Assignment Priority" + +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:108 +msgid "" +"Indica si los valores serán forzados al crear o modificar los elementos." +msgstr "Enforces the values to be set either on creating or updating an item." + +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:110 +msgid "Los valores serán añadidos a los existentes." +msgstr "Values will be merged with the existing ones." #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:76 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:78 @@ -6540,8 +6589,8 @@ msgstr "Group description" #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:67 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:69 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:527 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:529 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:543 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:545 msgid "Usado por" msgstr "Used by" @@ -6663,41 +6712,49 @@ msgstr "Links management" msgid "Gestión de cuentas" msgstr "Accounts management" +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:421 +msgid "Valores por Defecto" +msgstr "Default Values" + +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:422 +msgid "Gestión de Valores por Defecto" +msgstr "Default Values Management" + #. (itstool) path: action/text -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:426 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:442 #: ../../../config/actions.xml:679 msgid "Configuración General" msgstr "General Configuration" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:442 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:458 msgid "Opciones de encriptación" msgstr "Encryption options" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:457 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:473 msgid "Backup" msgstr "Backup" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:458 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:474 msgid "Realizar copia de seguridad y exportar" msgstr "Make a backup and export" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:473 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:489 msgid "Importar" msgstr "Import" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:474 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:490 msgid "Realizar importación de cuentas" msgstr "Make accounts import" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:493 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:509 msgid "Log de Eventos" msgstr "Event Log" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:494 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:510 msgid "Ver log de eventos" msgstr "View event log" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:520 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:536 msgid "Nombre del perfil" msgstr "Profile name" @@ -6810,6 +6867,31 @@ msgstr "Only for application administrators" msgid "Solo Admins" msgstr "Only Admins" +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:23 +msgid "Nombre del plugin" +msgstr "Plugin name" + +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:35 +msgid "Versión del plugin" +msgstr "Plugin version" + +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:40 +msgid "Versión Compatible" +msgstr "Compatible Version" + +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:47 +msgid "Versión de sysPass compatible" +msgstr "sysPass compatible version" + +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:52 +#: ../../../modules/web/themes/material-blue/views/wiki/wikipage.inc:25 +msgid "Autor" +msgstr "Author" + +#: ../../../modules/web/themes/material-blue/views/plugin/plugin.inc:59 +msgid "Autor del plugin" +msgstr "Plugin author" + #: ../../../modules/web/themes/material-blue/views/upgrade/index.inc:11 msgid "La aplicación necesita actualizarse" msgstr "The application needs to be updated" @@ -7191,8 +7273,8 @@ msgstr "Create Notification" #. (itstool) path: action/text #: ../../../config/actions.xml:835 -msgid "Gestión Permisos" -msgstr "Permissions Management" +msgid "Gestión Valores Predeterminados" +msgstr "Preset Values Management" #. (itstool) path: strings/text #: ../../../config/strings.xml:4 @@ -7224,6 +7306,39 @@ msgstr "Text" msgid "Link" msgstr "Link" +#~ msgid "Gestión Permisos" +#~ msgstr "Permissions Management" + +#~ msgid "Buscar Permiso" +#~ msgstr "Search for Permission" + +#~ msgid "Ver Permiso" +#~ msgstr "View Permission" + +#~ msgid "Editar Permiso" +#~ msgstr "Edit Permission" + +#~ msgid "Eliminar Permiso" +#~ msgstr "Delete Permission" + +#~ msgid "Permiso no encontrada" +#~ msgstr "Permission not found" + +#~ msgid "Permisos eliminados" +#~ msgstr "Permissions deleted" + +#~ msgid "Permiso eliminado" +#~ msgstr "Permission deleted" + +#~ msgid "Permiso creado" +#~ msgstr "Permission added" + +#~ msgid "Permiso actualizado" +#~ msgstr "Permission updated" + +#~ msgid "Gestión de Permisos" +#~ msgstr "Permissions Management" + #, fuzzy #~ msgid "Error al eliminar permisos" #~ msgstr "Error while removing the profile" @@ -7389,9 +7504,6 @@ msgstr "Link" #~ msgid "Modificar configuración" #~ msgstr "Update Configuration" -#~ msgid "Valor" -#~ msgstr "Value" - #~ msgid "Sección" #~ msgstr "Section" diff --git a/app/locales/en_US/LC_MESSAGES/messages.mo b/app/locales/en_US/LC_MESSAGES/messages.mo index ec32c0d8..53489fb7 100644 Binary files a/app/locales/en_US/LC_MESSAGES/messages.mo and b/app/locales/en_US/LC_MESSAGES/messages.mo differ diff --git a/app/locales/en_US/LC_MESSAGES/messages.po b/app/locales/en_US/LC_MESSAGES/messages.po index 87602d6f..d890d236 100644 --- a/app/locales/en_US/LC_MESSAGES/messages.po +++ b/app/locales/en_US/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-31 01:42+0100\n" -"PO-Revision-Date: 2018-08-31 01:44+0100\n" +"POT-Creation-Date: 2018-09-01 21:03+0100\n" +"PO-Revision-Date: 2018-09-01 21:04+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_US\n" @@ -74,7 +74,7 @@ msgstr "Please contact to the administrator" # Not available #: ../../../../lib/SP/Core/Acl/Acl.php:282 -#: ../../../../lib/SP/Services/Auth/LoginService.php:582 +#: ../../../../lib/SP/Services/Auth/LoginService.php:586 msgid "N/D" msgstr "N/A" @@ -94,16 +94,16 @@ msgstr "Action" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapMsAds.php:165 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:114 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:126 -#: ../../../../lib/SP/Services/Auth/LoginService.php:211 -#: ../../../../lib/SP/Services/Auth/LoginService.php:229 -#: ../../../../lib/SP/Services/Auth/LoginService.php:368 -#: ../../../../lib/SP/Services/Auth/LoginService.php:435 -#: ../../../../lib/SP/Services/Auth/LoginService.php:543 -#: ../../../../lib/SP/Services/Auth/LoginService.php:586 +#: ../../../../lib/SP/Services/Auth/LoginService.php:215 +#: ../../../../lib/SP/Services/Auth/LoginService.php:233 +#: ../../../../lib/SP/Services/Auth/LoginService.php:372 +#: ../../../../lib/SP/Services/Auth/LoginService.php:439 +#: ../../../../lib/SP/Services/Auth/LoginService.php:547 +#: ../../../../lib/SP/Services/Auth/LoginService.php:590 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:230 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:235 #: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:106 #: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 #: ../../../modules/web/Controllers/LoginController.php:102 #: ../../../modules/web/Controllers/UserController.php:278 @@ -169,7 +169,7 @@ msgstr "Invalid context" msgid "Contexto no inicializado" msgstr "Context not initialized" -#: ../../../../lib/SP/Core/Context/SessionContext.php:545 +#: ../../../../lib/SP/Core/Context/SessionContext.php:547 msgid "La sesión no puede ser inicializada" msgstr "Session cannot be initialized" @@ -195,12 +195,12 @@ msgstr "The key file does not exist" #: ../../../../lib/SP/Services/Api/ApiService.php:129 #: ../../../../lib/SP/Services/Api/ApiService.php:227 #: ../../../../lib/SP/Services/Api/ApiService.php:235 -#: ../../../../lib/SP/Services/Auth/LoginService.php:182 -#: ../../../../lib/SP/Services/Auth/LoginService.php:333 -#: ../../../../lib/SP/Services/Auth/LoginService.php:482 -#: ../../../../lib/SP/Services/Auth/LoginService.php:487 -#: ../../../../lib/SP/Services/Auth/LoginService.php:519 -#: ../../../../lib/SP/Services/Auth/LoginService.php:626 +#: ../../../../lib/SP/Services/Auth/LoginService.php:186 +#: ../../../../lib/SP/Services/Auth/LoginService.php:337 +#: ../../../../lib/SP/Services/Auth/LoginService.php:486 +#: ../../../../lib/SP/Services/Auth/LoginService.php:491 +#: ../../../../lib/SP/Services/Auth/LoginService.php:523 +#: ../../../../lib/SP/Services/Auth/LoginService.php:630 #: ../../../../lib/SP/Services/AuthToken/AuthTokenService.php:306 #: ../../../../lib/SP/Services/CustomField/CustomFieldService.php:203 #: ../../../../lib/SP/Services/Export/XmlVerifyService.php:108 @@ -241,19 +241,23 @@ msgstr "ON" msgid "OFF" msgstr "OFF" -#: ../../../../lib/SP/DataModel/TrackData.php:155 -#: ../../../../lib/SP/DataModel/TrackData.php:157 -#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:56 -#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:58 -msgid "IP inválida" -msgstr "Invalid IP" - #: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:306 #: ../../../../lib/SP/Mvc/View/Template.php:122 #, php-format msgid "No es posible obtener la plantilla \"%s\" : %s" msgstr "Unable to retrieve the \"%s\" template: %s" +#: ../../../../lib/SP/Http/Address.php:49 +#: ../../../../lib/SP/Http/Address.php:51 +#: ../../../../lib/SP/Http/Address.php:68 +#: ../../../../lib/SP/Http/Address.php:70 +#: ../../../../lib/SP/Http/Address.php:90 +#: ../../../../lib/SP/Http/Address.php:109 +#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:56 +#: ../../../../lib/SP/Repositories/Track/TrackRequest.php:58 +msgid "IP inválida" +msgstr "Invalid IP" + #: ../../../../lib/SP/Http/Json.php:179 msgid "Error de codificación" msgstr "Encoding error" @@ -398,7 +402,7 @@ msgstr "Error while searching the group RDN" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:115 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:127 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:137 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:107 #: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:114 #: ../../../modules/web/Controllers/UserGroupController.php:220 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:137 @@ -979,7 +983,7 @@ msgid "Fomato incorrecto" msgstr "Invalid format" #: ../../../../lib/SP/Services/Api/ApiService.php:96 -#: ../../../../lib/SP/Services/Auth/LoginService.php:132 +#: ../../../../lib/SP/Services/Auth/LoginService.php:136 #: ../../../../lib/SP/Services/UserPassRecover/UserPassRecoverService.php:103 #: ../../../modules/web/Controllers/UserPassResetController.php:124 msgid "Intentos excedidos" @@ -994,34 +998,34 @@ msgstr "Wrong parameters" msgid "Acceso no permitido" msgstr "Unauthorized access" -#: ../../../../lib/SP/Services/Auth/LoginService.php:152 -#: ../../../../lib/SP/Services/Auth/LoginService.php:438 -#: ../../../../lib/SP/Services/Auth/LoginService.php:445 -#: ../../../../lib/SP/Services/Auth/LoginService.php:553 -#: ../../../../lib/SP/Services/Auth/LoginService.php:558 -#: ../../../../lib/SP/Services/Auth/LoginService.php:597 -#: ../../../../lib/SP/Services/Auth/LoginService.php:602 +#: ../../../../lib/SP/Services/Auth/LoginService.php:156 +#: ../../../../lib/SP/Services/Auth/LoginService.php:442 +#: ../../../../lib/SP/Services/Auth/LoginService.php:449 +#: ../../../../lib/SP/Services/Auth/LoginService.php:557 +#: ../../../../lib/SP/Services/Auth/LoginService.php:562 +#: ../../../../lib/SP/Services/Auth/LoginService.php:601 +#: ../../../../lib/SP/Services/Auth/LoginService.php:606 msgid "Login incorrecto" msgstr "Wrong login" -#: ../../../../lib/SP/Services/Auth/LoginService.php:210 -#: ../../../../lib/SP/Services/Auth/LoginService.php:217 +#: ../../../../lib/SP/Services/Auth/LoginService.php:214 +#: ../../../../lib/SP/Services/Auth/LoginService.php:221 msgid "Usuario deshabilitado" msgstr "User disabled" -#: ../../../../lib/SP/Services/Auth/LoginService.php:262 +#: ../../../../lib/SP/Services/Auth/LoginService.php:266 msgid "Usando clave temporal" msgstr "Using temporary password" -#: ../../../../lib/SP/Services/Auth/LoginService.php:270 -#: ../../../../lib/SP/Services/Auth/LoginService.php:276 -#: ../../../../lib/SP/Services/Auth/LoginService.php:289 -#: ../../../../lib/SP/Services/Auth/LoginService.php:295 +#: ../../../../lib/SP/Services/Auth/LoginService.php:274 +#: ../../../../lib/SP/Services/Auth/LoginService.php:280 +#: ../../../../lib/SP/Services/Auth/LoginService.php:293 +#: ../../../../lib/SP/Services/Auth/LoginService.php:299 msgid "Clave maestra incorrecta" msgstr "Wrong master password" -#: ../../../../lib/SP/Services/Auth/LoginService.php:284 -#: ../../../../lib/SP/Services/Auth/LoginService.php:303 +#: ../../../../lib/SP/Services/Auth/LoginService.php:288 +#: ../../../../lib/SP/Services/Auth/LoginService.php:307 #: ../../../../lib/SP/Services/User/UpdatedMasterPassException.php:45 #: ../../../../lib/SP/Util/ErrorUtil.php:144 #: ../../../modules/web/Controllers/ConfigEncryptionController.php:68 @@ -1030,25 +1034,25 @@ msgstr "Wrong master password" msgid "Clave maestra actualizada" msgstr "Master password updated" -#: ../../../../lib/SP/Services/Auth/LoginService.php:309 +#: ../../../../lib/SP/Services/Auth/LoginService.php:313 msgid "Es necesaria su clave anterior" msgstr "Your previous password is needed" -#: ../../../../lib/SP/Services/Auth/LoginService.php:321 +#: ../../../../lib/SP/Services/Auth/LoginService.php:325 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "The Master Password either is not saved or is wrong" -#: ../../../../lib/SP/Services/Auth/LoginService.php:433 -#: ../../../../lib/SP/Services/Auth/LoginService.php:496 -#: ../../../../lib/SP/Services/Auth/LoginService.php:542 -#: ../../../../lib/SP/Services/Auth/LoginService.php:585 +#: ../../../../lib/SP/Services/Auth/LoginService.php:437 +#: ../../../../lib/SP/Services/Auth/LoginService.php:500 +#: ../../../../lib/SP/Services/Auth/LoginService.php:546 +#: ../../../../lib/SP/Services/Auth/LoginService.php:589 #: ../../../modules/web/Controllers/AccountFileController.php:233 #: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:104 #: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:105 #: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:117 -#: ../../../modules/web/Controllers/ItemPresetController.php:299 -#: ../../../modules/web/Controllers/ItemPresetController.php:338 +#: ../../../modules/web/Controllers/ItemPresetController.php:302 +#: ../../../modules/web/Controllers/ItemPresetController.php:341 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:31 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:33 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:16 @@ -1056,22 +1060,22 @@ msgstr "The Master Password either is not saved or is wrong" msgid "Tipo" msgstr "Type" -#: ../../../../lib/SP/Services/Auth/LoginService.php:434 -#: ../../../../lib/SP/Services/Auth/LoginService.php:497 +#: ../../../../lib/SP/Services/Auth/LoginService.php:438 +#: ../../../../lib/SP/Services/Auth/LoginService.php:501 msgid "Servidor LDAP" msgstr "LDAP Server" -#: ../../../../lib/SP/Services/Auth/LoginService.php:453 -#: ../../../../lib/SP/Services/Auth/LoginService.php:458 +#: ../../../../lib/SP/Services/Auth/LoginService.php:457 +#: ../../../../lib/SP/Services/Auth/LoginService.php:462 msgid "Cuenta expirada" msgstr "Account expired" -#: ../../../../lib/SP/Services/Auth/LoginService.php:466 -#: ../../../../lib/SP/Services/Auth/LoginService.php:471 +#: ../../../../lib/SP/Services/Auth/LoginService.php:470 +#: ../../../../lib/SP/Services/Auth/LoginService.php:475 msgid "El usuario no tiene grupos asociados" msgstr "The user has no associated groups" -#: ../../../../lib/SP/Services/Auth/LoginService.php:587 +#: ../../../../lib/SP/Services/Auth/LoginService.php:591 #: ../../../modules/web/themes/material-blue/views/config/general-auth.inc:10 msgid "Autentificación" msgstr "Authentication" @@ -2158,12 +2162,12 @@ msgstr "Option unavailable" #: ../../../modules/web/Controllers/CustomFieldController.php:295 #: ../../../modules/web/Controllers/EventlogController.php:94 #: ../../../modules/web/Controllers/ItemPresetController.php:67 -#: ../../../modules/web/Controllers/ItemPresetController.php:142 -#: ../../../modules/web/Controllers/ItemPresetController.php:177 -#: ../../../modules/web/Controllers/ItemPresetController.php:215 -#: ../../../modules/web/Controllers/ItemPresetController.php:245 -#: ../../../modules/web/Controllers/ItemPresetController.php:284 -#: ../../../modules/web/Controllers/ItemPresetController.php:323 +#: ../../../modules/web/Controllers/ItemPresetController.php:145 +#: ../../../modules/web/Controllers/ItemPresetController.php:180 +#: ../../../modules/web/Controllers/ItemPresetController.php:218 +#: ../../../modules/web/Controllers/ItemPresetController.php:248 +#: ../../../modules/web/Controllers/ItemPresetController.php:287 +#: ../../../modules/web/Controllers/ItemPresetController.php:326 #: ../../../modules/web/Controllers/NotificationController.php:100 #: ../../../modules/web/Controllers/NotificationController.php:160 #: ../../../modules/web/Controllers/NotificationController.php:175 @@ -2285,9 +2289,9 @@ msgstr "Account" #: ../../../modules/api/Controllers/ClientController.php:155 #: ../../../modules/api/Controllers/TagController.php:118 #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:100 -#: ../../../modules/web/Controllers/ItemPresetController.php:267 -#: ../../../modules/web/Controllers/ItemPresetController.php:300 -#: ../../../modules/web/Controllers/ItemPresetController.php:339 +#: ../../../modules/web/Controllers/ItemPresetController.php:270 +#: ../../../modules/web/Controllers/ItemPresetController.php:303 +#: ../../../modules/web/Controllers/ItemPresetController.php:342 #: ../../../modules/web/themes/material-blue/views/account/details.inc:138 #: ../../../modules/web/themes/material-blue/views/account/details.inc:140 msgid "ID" @@ -2640,7 +2644,7 @@ msgstr "Tag updated" msgid "Etiqueta eliminada" msgstr "Tag removed" -#: ../../../modules/api/Init.php:139 +#: ../../../modules/api/Init.php:132 msgid "Es necesario actualizar" msgstr "Updating needed" @@ -3431,7 +3435,8 @@ msgstr "Sort by URL / IP" #: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:69 #: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:70 #: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:69 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:74 #: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:83 #: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:71 #: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:70 @@ -3650,11 +3655,11 @@ msgstr "Download File" msgid "Eliminar Archivo" msgstr "Delete File" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:93 msgid "Valores Predeterminados" msgstr "Preset Values" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:108 #: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:113 #: ../../../modules/web/Controllers/UserProfileController.php:216 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:52 @@ -3665,43 +3670,57 @@ msgstr "Preset Values" msgid "Perfil" msgstr "Profile" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:109 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:70 msgid "Prioridad" msgstr "Priority" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:110 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:106 msgid "Forzado" msgstr "Forced" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:144 #: ../../../config/actions.xml:841 msgid "Buscar Valor" msgstr "Search for Value" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:159 +msgid "Valor de Permiso" +msgstr "Permission Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:160 msgid "Nuevo Valor de Permiso" msgstr "New Permission Preset" -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:176 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:177 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:183 +msgid "Valor de Cuenta Privada" +msgstr "Private Account Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:184 msgid "Nuevo Valor de Cuenta Privada" msgstr "New Private Account Preset" +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:207 +msgid "Valor de Timeout de Sesión" +msgstr "Session Timeout Preset" + +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:208 +msgid "Nuevo Valor de Timeout de Sesión" +msgstr "New Session Timeout Preset" + #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:197 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:198 -#: ../../../modules/web/Controllers/ItemPresetController.php:218 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:231 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:232 +#: ../../../modules/web/Controllers/ItemPresetController.php:221 #: ../../../config/actions.xml:859 msgid "Editar Valor" msgstr "Edit Value" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:214 -#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:215 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:248 +#: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:249 #: ../../../config/actions.xml:865 msgid "Eliminar Valor" msgstr "Delete Value" @@ -4073,28 +4092,28 @@ msgid "Ver Valor" msgstr "Display Value" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/ItemPresetController.php:188 +#: ../../../modules/web/Controllers/ItemPresetController.php:191 #: ../../../config/actions.xml:853 msgid "Nuevo Valor" msgstr "New Value" -#: ../../../modules/web/Controllers/ItemPresetController.php:255 #: ../../../modules/web/Controllers/ItemPresetController.php:258 +#: ../../../modules/web/Controllers/ItemPresetController.php:261 msgid "Valores eliminados" msgstr "Values deleted" -#: ../../../modules/web/Controllers/ItemPresetController.php:266 -#: ../../../modules/web/Controllers/ItemPresetController.php:270 +#: ../../../modules/web/Controllers/ItemPresetController.php:269 +#: ../../../modules/web/Controllers/ItemPresetController.php:273 msgid "Valor eliminado" msgstr "Value deleted" -#: ../../../modules/web/Controllers/ItemPresetController.php:298 -#: ../../../modules/web/Controllers/ItemPresetController.php:303 +#: ../../../modules/web/Controllers/ItemPresetController.php:301 +#: ../../../modules/web/Controllers/ItemPresetController.php:306 msgid "Valor creado" msgstr "Value created" -#: ../../../modules/web/Controllers/ItemPresetController.php:337 -#: ../../../modules/web/Controllers/ItemPresetController.php:342 +#: ../../../modules/web/Controllers/ItemPresetController.php:340 +#: ../../../modules/web/Controllers/ItemPresetController.php:345 msgid "Valor actualizado" msgstr "Value updated" @@ -4373,15 +4392,15 @@ msgstr "Field type not set" msgid "Módulo del campo no indicado" msgstr "Field module not set" -#: ../../../modules/web/Forms/ItemsPresetForm.php:106 +#: ../../../modules/web/Forms/ItemsPresetForm.php:111 msgid "Tipo de valor no definido o incorrecto" msgstr "Value type not set or incorrect" -#: ../../../modules/web/Forms/ItemsPresetForm.php:123 +#: ../../../modules/web/Forms/ItemsPresetForm.php:128 msgid "No hay permisos definidos" msgstr "There aren't any defined permissions" -#: ../../../modules/web/Forms/ItemsPresetForm.php:152 +#: ../../../modules/web/Forms/ItemsPresetForm.php:173 msgid "Es necesario asignar un elemento del tipo usuario, grupo o perfil" msgstr "An element of type user, group or profile need to be set" @@ -6462,6 +6481,16 @@ msgstr "Administrators won't be able to display the accounts." msgid "Las cuentas sólo serán visibles por el usuario y su grupo principal." msgstr "Accounts will be only visible by the user and his/her main group." +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:6 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:14 +msgid "Dirección IP" +msgstr "IP Address" + +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:19 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc:27 +msgid "Timeout" +msgstr "Timeout" + #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:76 msgid "" "Prioridad de asignación en caso de coincidir con otros valores asignados por " diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php index 79419450..31cd23e2 100644 --- a/app/modules/api/Init.php +++ b/app/modules/api/Init.php @@ -24,8 +24,7 @@ namespace SP\Modules\Api; -use DI\Container; -use DI\NotFoundException; +use Psr\Container\ContainerInterface; use SP\Core\Context\StatelessContext; use SP\Core\Exceptions\InitializationException; use SP\Core\Language; @@ -56,12 +55,9 @@ final class Init extends ModuleBase /** * Module constructor. * - * @param Container $container - * - * @throws \DI\DependencyException - * @throws \DI\NotFoundException + * @param ContainerInterface $container */ - public function __construct(Container $container) + public function __construct(ContainerInterface $container) { parent::__construct($container); @@ -73,11 +69,8 @@ final class Init extends ModuleBase * @param string $controller * * @throws InitializationException - * @throws \DI\DependencyException - * @throws \DI\NotFoundException - * @throws \SP\Core\Exceptions\SPException - * @throws NotFoundException * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException + * @throws \SP\Core\Context\ContextException */ public function initialize($controller) { diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php index fe1621ae..b49d9c8b 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php @@ -325,13 +325,13 @@ final class AccountHelper extends HelperBase $accountPrivate = new AccountPrivate(); if ($itemPresetPrivate = $this->itemPresetService->getForCurrentUser(ItemPresetInterface::ITEM_TYPE_ACCOUNT_PRIVATE)) { - $accountPrivate = $itemPresetPrivate->hydrate(AccountPrivate::class); + $accountPrivate = $itemPresetPrivate->hydrate(AccountPrivate::class) ?: $accountPrivate; } $accountPermission = new AccountPermission(); if ($itemPresetPermission = $this->itemPresetService->getForCurrentUser(ItemPresetInterface::ITEM_TYPE_ACCOUNT_PERMISSION)) { - $accountPermission = $itemPresetPermission->hydrate(AccountPermission::class); + $accountPermission = $itemPresetPermission->hydrate(AccountPermission::class) ?: $accountPermission; } $selectUsers = SelectItemAdapter::factory(UserService::getItemsBasic()); diff --git a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php index 9a948bf8..3ffc98dd 100644 --- a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php @@ -33,6 +33,7 @@ use SP\Html\DataGrid\DataGridData; use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Services\ItemPreset\ItemPresetInterface; use SP\Storage\Database\QueryResult; /** @@ -65,9 +66,12 @@ final class ItemPresetGrid extends GridBase $grid->setDataActions($this->getCreatePermissionAction(), true); $grid->setDataActions($this->getCreatePrivateAction(), true); + $grid->setDataActions($this->getCreateSessionTimeoutAction(), true); $grid->setDataActions($this->getEditAction()); $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions($this->getDeleteAction()->setTitle(__('Eliminar Seleccionados')), true); + $grid->setDataActions($this->getDeleteAction() + ->setTitle(__('Eliminar Seleccionados')) + ->setName(__('Eliminar Seleccionados')), true); $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5)); @@ -152,7 +156,7 @@ final class ItemPresetGrid extends GridBase $gridAction = new DataGridAction(); $gridAction->setId(ActionsInterface::ITEMPRESET_CREATE); $gridAction->setType(DataGridActionType::MENUBAR_ITEM); - $gridAction->setName(__('Nuevo Valor de Permiso')); + $gridAction->setName(__('Valor de Permiso')); $gridAction->setTitle(__('Nuevo Valor de Permiso')); $icon = clone $this->icons->getIconAdd(); @@ -160,7 +164,10 @@ final class ItemPresetGrid extends GridBase $gridAction->setIcon($icon->setIcon('add_circle')); $gridAction->setSkip(true); $gridAction->setOnClickFunction('appMgmt/show'); - $gridAction->addData('action-route', Acl::getActionRoute(ActionsInterface::ITEMPRESET_CREATE) . '/account.permission'); + + $route = Acl::getActionRoute(ActionsInterface::ITEMPRESET_CREATE) . '/' . ItemPresetInterface::ITEM_TYPE_ACCOUNT_PERMISSION; + + $gridAction->addData('action-route', $route); return $gridAction; } @@ -173,7 +180,7 @@ final class ItemPresetGrid extends GridBase $gridAction = new DataGridAction(); $gridAction->setId(ActionsInterface::ITEMPRESET_CREATE); $gridAction->setType(DataGridActionType::MENUBAR_ITEM); - $gridAction->setName(__('Nuevo Valor de Cuenta Privada')); + $gridAction->setName(__('Valor de Cuenta Privada')); $gridAction->setTitle(__('Nuevo Valor de Cuenta Privada')); $icon = clone $this->icons->getIconAdd(); @@ -181,7 +188,34 @@ final class ItemPresetGrid extends GridBase $gridAction->setIcon($icon->setIcon('add_circle')); $gridAction->setSkip(true); $gridAction->setOnClickFunction('appMgmt/show'); - $gridAction->addData('action-route', Acl::getActionRoute(ActionsInterface::ITEMPRESET_CREATE) . '/account.private'); + + $route = Acl::getActionRoute(ActionsInterface::ITEMPRESET_CREATE) . '/' . ItemPresetInterface::ITEM_TYPE_ACCOUNT_PRIVATE; + + $gridAction->addData('action-route', $route); + + return $gridAction; + } + + /** + * @return DataGridAction + */ + private function getCreateSessionTimeoutAction() + { + $gridAction = new DataGridAction(); + $gridAction->setId(ActionsInterface::ITEMPRESET_CREATE); + $gridAction->setType(DataGridActionType::MENUBAR_ITEM); + $gridAction->setName(__('Valor de Timeout de Sesión')); + $gridAction->setTitle(__('Nuevo Valor de Timeout de Sesión')); + + $icon = clone $this->icons->getIconAdd(); + + $gridAction->setIcon($icon->setIcon('add_circle')); + $gridAction->setSkip(true); + $gridAction->setOnClickFunction('appMgmt/show'); + + $route = Acl::getActionRoute(ActionsInterface::ITEMPRESET_CREATE) . '/' . ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT; + + $gridAction->addData('action-route', $route); return $gridAction; } diff --git a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php index 34adccaa..92a2db59 100644 --- a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php +++ b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php @@ -26,6 +26,7 @@ namespace SP\Modules\Web\Controllers\Helpers; use SP\DataModel\AccountPermission; use SP\DataModel\AccountPrivate; +use SP\DataModel\ItemPreset\SessionTimeout; use SP\DataModel\ItemPresetData; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Services\User\UserService; @@ -84,6 +85,21 @@ class ItemPresetHelper extends HelperBase $this->view->assign('private', $accountPrivate); } + /** + * @param ItemPresetData $itemPresetData + * + * @throws \SP\Core\Exceptions\NoSuchPropertyException + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function makeSessionTimeoutView(ItemPresetData $itemPresetData) + { + $sessionTimeout = $itemPresetData->hydrate(SessionTimeout::class, 'data') ?: new SessionTimeout($this->request->getClientAddress(), 3600); + + $this->view->assign('typeTemplate', 'item_preset-session_timeout'); + + $this->view->assign('sessionTimeout', $sessionTimeout); + } + /** * @param ItemPresetData $itemPresetData */ diff --git a/app/modules/web/Controllers/ItemPresetController.php b/app/modules/web/Controllers/ItemPresetController.php index d8f2b357..ac00f0c7 100644 --- a/app/modules/web/Controllers/ItemPresetController.php +++ b/app/modules/web/Controllers/ItemPresetController.php @@ -114,6 +114,9 @@ class ItemPresetController extends ControllerBase implements CrudControllerInter case ItemPresetInterface::ITEM_TYPE_ACCOUNT_PRIVATE: $itemPresetHelper->makeAccountPrivateView($itemPresetData); break; + case ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT: + $itemPresetHelper->makeSessionTimeoutView($itemPresetData); + break; } $this->view->assign('preset', $itemPresetData); diff --git a/app/modules/web/Forms/ItemsPresetForm.php b/app/modules/web/Forms/ItemsPresetForm.php index 5bfca233..9dced75c 100644 --- a/app/modules/web/Forms/ItemsPresetForm.php +++ b/app/modules/web/Forms/ItemsPresetForm.php @@ -25,9 +25,11 @@ namespace SP\Modules\Web\Forms; use SP\Core\Acl\ActionsInterface; +use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Exceptions\ValidationException; use SP\DataModel\AccountPermission; use SP\DataModel\AccountPrivate; +use SP\DataModel\ItemPreset\SessionTimeout; use SP\DataModel\ItemPresetData; use SP\Services\ItemPreset\ItemPresetInterface; use SP\Services\ItemPreset\ItemPresetRequest; @@ -102,6 +104,9 @@ final class ItemsPresetForm extends FormBase implements FormInterface case ItemPresetInterface::ITEM_TYPE_ACCOUNT_PRIVATE: $this->itemPresetRequest = new ItemPresetRequest($itemPresetData, $this->makePrivatePreset()); break; + case ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT: + $this->itemPresetRequest = new ItemPresetRequest($itemPresetData, $this->makeSessionTimeoutreset()); + break; default: throw new ValidationException(__u('Tipo de valor no definido o incorrecto')); } @@ -138,6 +143,22 @@ final class ItemsPresetForm extends FormBase implements FormInterface return $accountPrivate; } + /** + * @return SessionTimeout + * @throws ValidationException + */ + private function makeSessionTimeoutreset() + { + try { + return new SessionTimeout( + $this->request->analyzeString('ip_address'), + $this->request->analyzeInt('timeout') + ); + } catch (InvalidArgumentException $e) { + throw new ValidationException($e->getMessage()); + } + } + /** * @throws ValidationException */ diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php index c0bc53c6..f9291ea1 100644 --- a/app/modules/web/Init.php +++ b/app/modules/web/Init.php @@ -25,9 +25,8 @@ namespace SP\Modules\Web; use Defuse\Crypto\Exception\CryptoException; -use DI\Container; +use Psr\Container\ContainerInterface; use SP\Bootstrap; -use SP\Core\Context\ContextException; use SP\Core\Context\ContextInterface; use SP\Core\Context\SessionContext; use SP\Core\Crypt\CryptSessionHandler; @@ -36,8 +35,12 @@ use SP\Core\Crypt\UUIDCookie; use SP\Core\Language; use SP\Core\ModuleBase; use SP\Core\UI\Theme; +use SP\DataModel\ItemPreset\SessionTimeout; +use SP\Http\Address; use SP\Plugin\PluginManager; use SP\Services\Crypt\SecureSessionService; +use SP\Services\ItemPreset\ItemPresetInterface; +use SP\Services\ItemPreset\ItemPresetService; use SP\Services\Upgrade\UpgradeAppService; use SP\Services\Upgrade\UpgradeDatabaseService; use SP\Services\Upgrade\UpgradeUtil; @@ -49,6 +52,7 @@ use SP\Util\HttpUtil; /** * Class Init * + * @property itemPresetService * @package SP\Modules\Web */ final class Init extends ModuleBase @@ -79,16 +83,21 @@ final class Init extends ModuleBase * @var PluginManager */ private $pluginManager; + /** + * @var ItemPresetService + */ + private $itemPresetService; + /** + * @var bool + */ + private $isIndex = false; /** * Init constructor. * - * @param Container $container - * - * @throws \DI\DependencyException - * @throws \DI\NotFoundException + * @param ContainerInterface $container */ - public function __construct(Container $container) + public function __construct(ContainerInterface $container) { parent::__construct($container); @@ -97,6 +106,7 @@ final class Init extends ModuleBase $this->language = $container->get(Language::class); $this->secureSessionService = $container->get(SecureSessionService::class); $this->pluginManager = $container->get(PluginManager::class); + $this->itemPresetService = $container->get(ItemPresetService::class); } /** @@ -104,15 +114,19 @@ final class Init extends ModuleBase * * @param string $controller * - * @throws \DI\DependencyException - * @throws \DI\NotFoundException - * @throws \SP\Core\Exceptions\SPException * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException + * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\InvalidClassException + * @throws \SP\Core\Exceptions\QueryException + * @throws \SP\Repositories\NoSuchItemException + * @throws \Exception */ public function initialize($controller) { logger(__METHOD__); + $this->isIndex = $controller === 'index'; + // Iniciar la sesión de PHP $this->initSession($this->configData->isEncryptSession()); @@ -202,7 +216,7 @@ final class Init extends ModuleBase * * @param bool $encrypt Encriptar la sesión de PHP * - * @throws ContextException + * @throws \Exception */ private function initSession($encrypt = false) { @@ -215,7 +229,7 @@ final class Init extends ModuleBase try { $this->context->initialize(); - } catch (ContextException $e) { + } catch (\Exception $e) { $this->router->response()->header('HTTP/1.1', '500 Internal Server Error'); throw $e; @@ -262,7 +276,6 @@ final class Init extends ModuleBase SessionContext::restart(); } else { - $sidStartTime = $this->context->getSidStartTime(); // Regenerar el Id de sesión periódicamente para evitar fijación @@ -273,14 +286,11 @@ final class Init extends ModuleBase $this->context->setSidStartTime(time()); $this->context->setStartActivity(time()); } else if (!$inMaintenance - && time() > ($sidStartTime + 120) + && time() > ($sidStartTime + SessionContext::MAX_SID_TIME) && $this->context->isLoggedIn() ) { try { CryptSession::reKey($this->context); - - // Recargar los permisos del perfil de usuario -// $this->session->setUserProfile(Profile::getItem()->getById($this->session->getUserData()->getUserProfileId())); } catch (CryptoException $e) { logger($e->getMessage()); @@ -300,10 +310,44 @@ final class Init extends ModuleBase */ private function getSessionLifeTime() { - if (($timeout = $this->context->getSessionTimeout()) === null) { - return $this->context->setSessionTimeout($this->configData->getSessionTimeout()); + $timeout = $this->context->getSessionTimeout(); + + try { + if ($this->isIndex || $timeout === null) { + $userTimeout = $this->getSessionTimeoutForUser($timeout) ?: $this->configData->getSessionTimeout(); + + return $this->context->setSessionTimeout($userTimeout); + } + } catch (\Exception $e) { + processException($e); } return $timeout; } + + /** + * @param int $default + * + * @return int + * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\InvalidArgumentException + * @throws \SP\Core\Exceptions\NoSuchPropertyException + * @throws \SP\Core\Exceptions\QueryException + */ + private function getSessionTimeoutForUser(int $default = null) + { + if ($this->context->isLoggedIn()) { + $itemPreset = $this->itemPresetService->getForCurrentUser(ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT); + + if ($itemPreset !== null) { + $sessionTimeout = $itemPreset->hydrate(SessionTimeout::class); + + if (Address::check($this->request->getClientAddress(), $sessionTimeout->getAddress(), $sessionTimeout->getMask())) { + return $sessionTimeout->getTimeout(); + } + } + } + + return $default; + } } \ No newline at end of file diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc index 66e34e07..959248d3 100644 --- a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc +++ b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc @@ -24,7 +24,8 @@ if (!isset($index)): $index = 0; endif; ?> getIcon()->getIcon(); ?> getTitle(); ?> + class="mdl-tooltip mdl-tooltip--bottom" + title="getTitle(); ?>">getName(); ?> getType() === \SP\Html\DataGrid\DataGridActionType::SEARCH_ITEM): ?>
  • @@ -89,11 +90,12 @@ if (!isset($index)): $index = 0; endif; ?> for="menu-getId(); ?>-menu-lower-right"> getDataActionsMenu() as $action): ?>
  • getData() as $dataName => $dataValue): echo 'data-', $dataName, '=', '"', $dataValue, '"'; endforeach; ?>> getIcon()->getIcon(); ?> - getTitle(); ?> + getName(); ?>
    • diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc new file mode 100644 index 00000000..d0ecd4cf --- /dev/null +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc @@ -0,0 +1,32 @@ + + + + + + + + + + + + + +
    +
    + + +
    +
    +
    + + +
    +
    \ No newline at end of file diff --git a/lib/SP/Bootstrap.php b/lib/SP/Bootstrap.php index f207180a..05ddc6e4 100644 --- a/lib/SP/Bootstrap.php +++ b/lib/SP/Bootstrap.php @@ -132,7 +132,7 @@ final class Bootstrap */ protected function initRouter() { - $oops = "Oops, it looks like this content doesn't exist..."; + $oops = "Oops, it looks like this content does not exist..."; $this->router->onError(function ($router, $err_msg, $type, $err) { logger('Routing error: ' . $err_msg); diff --git a/lib/SP/Core/Context/ContextInterface.php b/lib/SP/Core/Context/ContextInterface.php index 1b3f3b9e..64ac9705 100644 --- a/lib/SP/Core/Context/ContextInterface.php +++ b/lib/SP/Core/Context/ContextInterface.php @@ -37,7 +37,6 @@ use SP\Services\User\UserLoginResponse; interface ContextInterface { /** - * @return void * @throws ContextException */ public function initialize(); diff --git a/lib/SP/Core/Context/SessionContext.php b/lib/SP/Core/Context/SessionContext.php index e85d3318..217a33c9 100644 --- a/lib/SP/Core/Context/SessionContext.php +++ b/lib/SP/Core/Context/SessionContext.php @@ -38,6 +38,8 @@ use SP\Services\User\UserLoginResponse; */ final class SessionContext extends ContextBase { + const MAX_SID_TIME = 120; + private static $isReset = false; private static $isLocked = false; diff --git a/lib/SP/Core/ModuleBase.php b/lib/SP/Core/ModuleBase.php index 8f89c5bc..83081005 100644 --- a/lib/SP/Core/ModuleBase.php +++ b/lib/SP/Core/ModuleBase.php @@ -26,6 +26,7 @@ namespace SP\Core; use DI\Container; use Klein\Klein; +use Psr\Container\ContainerInterface; use SP\Bootstrap; use SP\Config\Config; use SP\Core\Context\ContextInterface; @@ -70,12 +71,9 @@ abstract class ModuleBase /** * Module constructor. * - * @param Container $container - * - * @throws \DI\DependencyException - * @throws \DI\NotFoundException + * @param ContainerInterface $container */ - public function __construct(Container $container) + public function __construct(ContainerInterface $container) { $this->container = $container; $this->config = $container->get(Config::class); @@ -118,9 +116,6 @@ abstract class ModuleBase /** * Initializes event handlers - * - * @throws \DI\DependencyException - * @throws \DI\NotFoundException */ protected function initEventHandlers() { diff --git a/lib/SP/DataModel/ItemPreset/SessionTimeout.php b/lib/SP/DataModel/ItemPreset/SessionTimeout.php new file mode 100644 index 00000000..3d5726d2 --- /dev/null +++ b/lib/SP/DataModel/ItemPreset/SessionTimeout.php @@ -0,0 +1,104 @@ +. + */ + +namespace SP\DataModel\ItemPreset; + +use SP\Http\Address; + +/** + * Class SessionTimeout + * + * @package SP\DataModel\ItemPreset + */ +class SessionTimeout +{ + /** + * @var string + */ + private $address; + /** + * @var string + */ + private $mask; + /** + * @var int + */ + private $timeout; + + /** + * SessionTimeout constructor. + * + * @param string $address IP address and/or mask + * @param int $timeout Timeout in seconds + * + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function __construct(string $address, int $timeout) + { + $parse = Address::parse4($address); + + $this->address = $parse['address']; + $this->timeout = $timeout; + + $this->setMask($parse); + } + + /** + * @param array $parse + */ + private function setMask(array $parse) + { + if (isset($parse['cidr'])) { + $this->mask = Address::cidrToDec($parse['cidr']); + } elseif (isset($parse['mask'])) { + $this->mask = $parse['mask']; + } else { + $this->mask = '255.255.255.255'; + } + } + + /** + * @return string + */ + public function getAddress(): string + { + return $this->address; + } + + /** + * @return string + */ + public function getMask(): string + { + return $this->mask; + } + + /** + * @return int + */ + public function getTimeout(): int + { + return $this->timeout; + } +} \ No newline at end of file diff --git a/lib/SP/DataModel/PublicLinkData.php b/lib/SP/DataModel/PublicLinkData.php index 870eeaa9..cd33b47a 100644 --- a/lib/SP/DataModel/PublicLinkData.php +++ b/lib/SP/DataModel/PublicLinkData.php @@ -311,7 +311,7 @@ class PublicLinkData extends DataModelBase implements DataModelInterface */ public function getName() { - // TODO: Implement getName() method. + return ''; } /** diff --git a/lib/SP/DataModel/TrackData.php b/lib/SP/DataModel/TrackData.php index 6dd32b40..b21383eb 100644 --- a/lib/SP/DataModel/TrackData.php +++ b/lib/SP/DataModel/TrackData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Core\Exceptions\InvalidArgumentException; +use SP\Http\Address; /** * Class TrackData @@ -123,19 +123,26 @@ class TrackData extends DataModelBase } /** - * @return string + * @return string|null + * @throws \SP\Core\Exceptions\InvalidArgumentException */ public function getIpv4() { - return @inet_ntop($this->ipv4); + if (!empty($this->ipv4)) { + return Address::fromBinary($this->ipv4); + } + + return null; } /** * @param string $ipv4 + * + * @throws \SP\Core\Exceptions\InvalidArgumentException */ public function setIpv4($ipv4) { - $this->ipv4 = @inet_pton($ipv4); + $this->ipv4 = Address::toBinary($ipv4); } /** @@ -145,16 +152,12 @@ class TrackData extends DataModelBase */ public function setTrackIp($track_ip) { - $ip = @inet_pton($track_ip); + $ip = Address::toBinary($track_ip); if (strlen($ip) === 4) { $this->ipv4 = $ip; } elseif (strlen($ip) > 4) { $this->ipv6 = $ip; - } elseif ($ip === false) { - logger(sprintf('%s : %s', __('IP inválida'), $track_ip)); - - throw new InvalidArgumentException(__u('IP inválida'), InvalidArgumentException::ERROR, $track_ip); } } @@ -167,19 +170,26 @@ class TrackData extends DataModelBase } /** - * @return string + * @return string|null + * @throws \SP\Core\Exceptions\InvalidArgumentException */ public function getIpv6() { - return @inet_ntop($this->ipv6); + if (!empty($this->ipv6)) { + return Address::fromBinary($this->ipv6); + } + + return null; } /** * @param string $ipv6 + * + * @throws \SP\Core\Exceptions\InvalidArgumentException */ public function setIpv6($ipv6) { - $this->ipv6 = @inet_pton($ipv6); + $this->ipv6 = Address::toBinary($ipv6); } /** diff --git a/lib/SP/Http/Address.php b/lib/SP/Http/Address.php new file mode 100644 index 00000000..ee4063c9 --- /dev/null +++ b/lib/SP/Http/Address.php @@ -0,0 +1,127 @@ +. + */ + +namespace SP\Http; + +use SP\Core\Exceptions\InvalidArgumentException; + +/** + * Class Address + * + * @package SP\Http + */ +class Address +{ + const PATTERN_IP_ADDRESS = '#^(?
    [\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3})(?:/(?:(?[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3})|(?[\d]{1,2})))?$#'; + + /** + * @param $address + * + * @return mixed + * @throws InvalidArgumentException + */ + public static function toBinary(string $address) + { + if (!filter_var($address, FILTER_VALIDATE_IP) + || ($binAddress = @inet_pton($address)) === false + ) { + logger(sprintf('%s : %s', __('IP inválida'), $address)); + + throw new InvalidArgumentException(__u('IP inválida'), InvalidArgumentException::ERROR, $address); + } + + return $binAddress; + } + + /** + * @param string $address + * + * @return string + * @throws InvalidArgumentException + */ + public static function fromBinary(string $address) + { + $stringAddress = @inet_ntop($address); + + if ($stringAddress === false) { + logger(sprintf('%s : %s', __('IP inválida'), $address)); + + throw new InvalidArgumentException(__u('IP inválida'), InvalidArgumentException::ERROR, $address); + } + + return $stringAddress; + } + + /** + * Parses an IPv4 address from either "192.168.0.1", "192.168.0.0/255.255.255.0" or "192.168.0.0/24" formats + * + * @param string $address + * + * @return array + * @throws InvalidArgumentException + */ + public static function parse4(string $address) + { + if (preg_match(self::PATTERN_IP_ADDRESS, $address, $matches)) { + return $matches; + } + + throw new InvalidArgumentException(__u('IP inválida'), InvalidArgumentException::ERROR, $address); + } + + /** + * Checks whether an IP address is included within $inAddress and $inMask + * + * @param string $address + * @param string $inAddress + * @param string $inMask + * + * @return int + * @throws InvalidArgumentException + */ + public static function check(string $address, string $inAddress, string $inMask) + { + if (!filter_var($address, FILTER_VALIDATE_IP) + || !filter_var($inAddress, FILTER_VALIDATE_IP) + || !filter_var($inMask, FILTER_VALIDATE_IP) + ) { + throw new InvalidArgumentException(__u('IP inválida'), InvalidArgumentException::ERROR, $address); + } + + // Obtains subnets based on mask ie.: subnet === subnet + return (ip2long($address) & ip2long($inMask)) === (ip2long($inAddress) & ip2long($inMask)); + } + + /** + * Converts a CIDR mask into decimal + * + * @param int $bits + * + * @return int + */ + public static function cidrToDec(int $bits) + { + return long2ip(-1 << (32 - $bits)); + } +} \ No newline at end of file diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php index 02dc74eb..8c07bf43 100644 --- a/lib/SP/Http/Request.php +++ b/lib/SP/Http/Request.php @@ -143,7 +143,7 @@ final class Request /** * @param bool $fullForwarded * - * @return array|array[]|mixed|string + * @return array|string */ public function getClientAddress(bool $fullForwarded = false) { diff --git a/lib/SP/Repositories/Account/AccountToUserRepository.php b/lib/SP/Repositories/Account/AccountToUserRepository.php index 61917ad0..047fc387 100644 --- a/lib/SP/Repositories/Account/AccountToUserRepository.php +++ b/lib/SP/Repositories/Account/AccountToUserRepository.php @@ -172,11 +172,9 @@ final class AccountToUserRepository extends Repository * * @param int $id con el id de la cuenta * - * @return ItemData[] con los id de usuarios de la cuenta + * @return \SP\Storage\Database\QueryResult * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException - * - * @todo change returned type */ public function getUsersByAccountId($id) { @@ -192,6 +190,6 @@ final class AccountToUserRepository extends Repository $queryData->addParam($id); $queryData->setMapClassName(ItemData::class); - return $this->db->doSelect($queryData)->getDataAsArray(); + return $this->db->doSelect($queryData); } } \ No newline at end of file diff --git a/lib/SP/Services/Account/AccountHistoryService.php b/lib/SP/Services/Account/AccountHistoryService.php index 9e762f39..e77c9b56 100644 --- a/lib/SP/Services/Account/AccountHistoryService.php +++ b/lib/SP/Services/Account/AccountHistoryService.php @@ -126,7 +126,7 @@ final class AccountHistoryService extends Service */ public function getUsersByAccountId($id) { - return $this->accountToUserRepository->getUsersByAccountId($id); + return $this->accountToUserRepository->getUsersByAccountId($id)->getDataAsArray(); } /** diff --git a/lib/SP/Services/Account/AccountSearchService.php b/lib/SP/Services/Account/AccountSearchService.php index eab2bdcd..4309ab5f 100644 --- a/lib/SP/Services/Account/AccountSearchService.php +++ b/lib/SP/Services/Account/AccountSearchService.php @@ -346,7 +346,7 @@ final class AccountSearchService extends Service ) { $cache[$accountId] = new AccountCache( $accountId, - $this->accountToUserRepository->getUsersByAccountId($accountId), + $this->accountToUserRepository->getUsersByAccountId($accountId)->getDataAsArray(), $this->accountToUserGroupRepository->getUserGroupsByAccountId($accountId)->getDataAsArray()); if ($hasCache) { diff --git a/lib/SP/Services/Account/AccountService.php b/lib/SP/Services/Account/AccountService.php index ff3ed760..af37aaf0 100644 --- a/lib/SP/Services/Account/AccountService.php +++ b/lib/SP/Services/Account/AccountService.php @@ -89,7 +89,7 @@ final class AccountService extends Service implements AccountServiceInterface */ public function withUsersById(AccountDetailsResponse $accountDetailsResponse) { - $accountDetailsResponse->setUsers($this->accountToUserRepository->getUsersByAccountId($accountDetailsResponse->getId())); + $accountDetailsResponse->setUsers($this->accountToUserRepository->getUsersByAccountId($accountDetailsResponse->getId())->getDataAsArray()); return $this; } diff --git a/lib/SP/Services/Auth/LoginService.php b/lib/SP/Services/Auth/LoginService.php index 909e646c..430aba28 100644 --- a/lib/SP/Services/Auth/LoginService.php +++ b/lib/SP/Services/Auth/LoginService.php @@ -73,43 +73,47 @@ final class LoginService extends Service /** * @var UserLoginData */ - protected $userLoginData; + private $userLoginData; /** * @var ConfigData */ - protected $configData; + private $configData; /** * @var Theme */ - protected $theme; + private $theme; /** * @var UserService */ - protected $userService; + private $userService; /** * @var Language */ - protected $language; + private $language; /** * @var TrackService */ - protected $trackService; + private $trackService; /** * @var TrackRequest */ - protected $trackRequest; + private $trackRequest; /** * @var string */ - protected $from; + private $from; /** * @var Request */ - protected $request; + private $request; /** * Ejecutar las acciones de login * + * @uses LoginService::authBrowser() + * @uses LoginService::authDatabase() + * @uses LoginService::authLdap() + * * @return LoginResponse * @throws AuthException * @throws SPException @@ -198,7 +202,7 @@ final class LoginService extends Service * @throws \SP\Core\Exceptions\QueryException * @return LoginResponse */ - protected function checkUser() + private function checkUser() { $userLoginResponse = $this->userLoginData->getUserLoginResponse(); @@ -247,7 +251,7 @@ final class LoginService extends Service * @throws \Psr\Container\ContainerExceptionInterface * @throws \Psr\Container\NotFoundExceptionInterface */ - protected function loadMasterPass() + private function loadMasterPass() { $temporaryMasterPass = $this->dic->get(TemporaryMasterPassService::class); $userPassService = $this->dic->get(UserPassService::class); @@ -348,7 +352,7 @@ final class LoginService extends Service * @throws \SP\Core\Exceptions\QueryException * @throws \SP\Repositories\NoSuchItemException */ - protected function setUserSession() + private function setUserSession() { $userLoginResponse = $this->userLoginData->getUserLoginResponse(); @@ -372,7 +376,7 @@ final class LoginService extends Service /** * Cargar las preferencias del usuario y comprobar si usa 2FA */ - protected function loadUserPreferences() + private function loadUserPreferences() { $this->language->setLanguage(true); @@ -426,7 +430,7 @@ final class LoginService extends Service * @throws \SP\Core\Exceptions\SPException * @throws AuthException */ - protected function authLdap(LdapAuthData $authData) + private function authLdap(LdapAuthData $authData) { if ($authData->getStatusCode() > 0) { $eventMessage = EventMessage::factory() @@ -536,7 +540,7 @@ final class LoginService extends Service * @throws \SP\Core\Exceptions\SPException * @throws AuthException */ - protected function authDatabase(DatabaseAuthData $authData) + private function authDatabase(DatabaseAuthData $authData) { $eventMessage = EventMessage::factory() ->addDetail(__u('Tipo'), __FUNCTION__) @@ -577,7 +581,7 @@ final class LoginService extends Service * @return mixed * @throws AuthException */ - protected function authBrowser(BrowserAuthData $authData) + private function authBrowser(BrowserAuthData $authData) { $authType = $this->request->getServer('AUTH_TYPE') ?: __('N/D'); diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php index b933e0d1..37616656 100644 --- a/lib/SP/Services/Install/Installer.php +++ b/lib/SP/Services/Install/Installer.php @@ -57,7 +57,7 @@ final class Installer extends Service */ const VERSION = [3, 0, 0]; const VERSION_TEXT = '3.0-beta'; - const BUILD = 18083002; + const BUILD = 18090101; /** * @var DatabaseSetupInterface diff --git a/lib/SP/Services/ItemPreset/ItemPresetInterface.php b/lib/SP/Services/ItemPreset/ItemPresetInterface.php index f8472b60..6297245c 100644 --- a/lib/SP/Services/ItemPreset/ItemPresetInterface.php +++ b/lib/SP/Services/ItemPreset/ItemPresetInterface.php @@ -35,4 +35,5 @@ interface ItemPresetInterface const ITEM_TYPE_ACCOUNT_TAG = 'account.tag'; const ITEM_TYPE_PASSWORD = 'password'; const ITEM_TYPE_ACCOUNT_PRIVATE = 'account.private'; + const ITEM_TYPE_SESSION_TIMEOUT = 'session.timeout'; } \ No newline at end of file diff --git a/tests/SP/Http/AddressTest.php b/tests/SP/Http/AddressTest.php new file mode 100644 index 00000000..3b37eb6a --- /dev/null +++ b/tests/SP/Http/AddressTest.php @@ -0,0 +1,268 @@ +. + */ + +namespace SP\Tests\Http; + +use Faker\Factory; +use PHPUnit\Framework\TestCase; +use SP\Core\Exceptions\InvalidArgumentException; +use SP\Http\Address; + +/** + * Class AddressTest + * + * @package SP\Tests\Http + */ +class AddressTest extends TestCase +{ + + /** + * @dataProvider binaryCheckProvider + * + * @param string $address + * + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function testBinary($address) + { + $binary = Address::toBinary($address); + + $this->assertNotEmpty($binary); + $this->assertEquals($address, Address::fromBinary($binary)); + } + + /** + * @return array + */ + public function binaryCheckProvider() + { + $faker = Factory::create(); + + $out = []; + + for ($i = 0; $i <= 100; $i++) { + $out[] = [$faker->ipv4]; + $out[] = [$faker->ipv6]; + } + + return $out; + } + + /** + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function testBinaryInvalidIpv4() + { + $this->expectException(InvalidArgumentException::class); + + Address::toBinary('192.168.0.256'); + } + + /** + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function testBinaryInvalidIpv6() + { + $this->expectException(InvalidArgumentException::class); + + Address::toBinary('1200::AB00:1234::2552:7777:1313'); + } + + /** + * @dataProvider checkAddressProvider + * + * @param string $address + * @param string $inAddress + * @param string $inMask + * @param bool $expected + * + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function testCheck($address, $inAddress, $inMask, $expected) + { + $this->assertEquals($expected, Address::check($address, $inAddress, $inMask)); + } + + /** + * @dataProvider checkAddressCidrProvider + * + * @param string $address + * @param string $inAddress + * @param string $inMask + * @param bool $expected + * + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + public function testCheckWithCidr($address, $inAddress, $inMask, $expected) + { + $this->assertEquals($expected, Address::check($address, $inAddress, Address::cidrToDec($inMask))); + } + + /** + * @return array + */ + public function checkAddressProvider() + { + return [ + ['192.168.0.1', '192.168.0.0', '255.255.255.0', true], + ['192.168.0.1', '192.168.0.0', '255.255.0.0', true], + ['192.168.0.1', '192.168.0.0', '255.0.0.0', true], + ['192.168.0.1', '192.168.1.0', '255.255.255.0', false], + ['192.168.0.1', '172.168.0.1', '255.255.0.0', false], + ['192.168.0.1', '10.0.0.1', '255.0.0.0', false] + ]; + } + + /** + * @return array + */ + public function checkAddressCidrProvider() + { + return [ + ['192.168.0.1', '192.168.0.0', '24', true], + ['192.168.0.1', '192.168.0.0', '16', true], + ['192.168.0.1', '192.168.0.0', '8', true], + ['192.168.0.1', '192.168.1.0', '24', false], + ['192.168.0.1', '172.168.0.1', '16', false], + ['192.168.0.1', '10.0.0.1', '8', false] + ]; + } + + /** + * @throws InvalidArgumentException + */ + public function testParse() + { + $address = '192.168.0.1/255.255.255.0'; + $parse = Address::parse4($address); + + $this->assertCount(5, $parse); + $this->assertArrayHasKey('address', $parse); + $this->assertEquals('192.168.0.1', $parse['address']); + $this->assertArrayHasKey('mask', $parse); + $this->assertEquals('255.255.255.0', $parse['mask']); + + $address = '192.168.0.2'; + $parse = Address::parse4($address); + + $this->assertCount(3, $parse); + $this->assertArrayHasKey('address', $parse); + $this->assertEquals('192.168.0.2', $parse['address']); + + $address = '192.168.0.1/24'; + $parse = Address::parse4($address); + + $this->assertCount(7, $parse); + $this->assertArrayHasKey('address', $parse); + $this->assertEquals('192.168.0.1', $parse['address']); + $this->assertArrayHasKey('cidr', $parse); + $this->assertEquals('24', $parse['cidr']); + } + + /** + * @throws InvalidArgumentException + */ + public function testParseInvalidIp() + { + $this->expectException(InvalidArgumentException::class); + + $address = '192.168.0.1000/255.255.255.0'; + Address::parse4($address); + } + + /** + * @throws InvalidArgumentException + */ + public function testParseInvalidMask() + { + $this->expectException(InvalidArgumentException::class); + + $address = '192.168.0.100/255.255.2500.0'; + Address::parse4($address); + } + + /** + * @throws InvalidArgumentException + */ + public function testParseInvalidCidr() + { + $this->expectException(InvalidArgumentException::class); + + $address = '192.168.0.100/100'; + Address::parse4($address); + } + + /** + * @dataProvider checkCidrProvider + * + * @param $cidr + * @param $mask + */ + public function testCidrToDec($cidr, $mask) + { + $this->assertEquals($mask, Address::cidrToDec($cidr)); + } + + /** + * @return array + */ + public function checkCidrProvider() + { + return [ + [32, '255.255.255.255'], + [31, '255.255.255.254'], + [30, '255.255.255.252'], + [29, '255.255.255.248'], + [28, '255.255.255.240'], + [27, '255.255.255.224'], + [26, '255.255.255.192'], + [25, '255.255.255.128'], + [24, '255.255.255.0'], + [23, '255.255.254.0'], + [22, '255.255.252.0'], + [21, '255.255.248.0'], + [20, '255.255.240.0'], + [19, '255.255.224.0'], + [18, '255.255.192.0'], + [17, '255.255.128.0'], + [16, '255.255.0.0'], + [15, '255.254.0.0'], + [14, '255.252.0.0'], + [13, '255.248.0.0'], + [12, '255.240.0.0'], + [11, '255.224.0.0'], + [10, '255.192.0.0'], + [9, '255.128.0.0'], + [8, '255.0.0.0'], + [7, '254.0.0.0'], + [6, '252.0.0.0'], + [5, '248.0.0.0'], + [4, '240.0.0.0'], + [3, '224.0.0.0'], + [2, '192.0.0.0'], + [1, '128.0.0.0'], + [0, '0.0.0.0'] + ]; + } +} diff --git a/tests/SP/Modules/Api/ApiTest.php b/tests/SP/Modules/Api/ApiTest.php index 3664f4c6..cf86c782 100644 --- a/tests/SP/Modules/Api/ApiTest.php +++ b/tests/SP/Modules/Api/ApiTest.php @@ -86,7 +86,7 @@ class ApiTest extends WebTestCase $this->assertInstanceOf(\stdClass::class, $result); $this->assertEquals('2.0', $result->jsonrpc); - $this->assertEquals('Oops, it looks like this content doesn\'t exist...', $result->error->message); + $this->assertEquals('Oops, it looks like this content does not exist...', $result->error->message); $this->assertEquals(JsonRpcResponse::METHOD_NOT_FOUND, $result->error->code); $this->assertNull($result->error->data); $this->assertEquals(1, $result->id); diff --git a/tests/SP/Repositories/AccountToUserRepositoryTest.php b/tests/SP/Repositories/AccountToUserRepositoryTest.php index 71d1729c..022ecbfd 100644 --- a/tests/SP/Repositories/AccountToUserRepositoryTest.php +++ b/tests/SP/Repositories/AccountToUserRepositoryTest.php @@ -73,43 +73,47 @@ class AccountToUserRepositoryTest extends DatabaseTestCase */ public function testGetUsersByAccountId() { - $users = self::$repository->getUsersByAccountId(1); + $result = self::$repository->getUsersByAccountId(1); + $this->assertEquals(1, $result->getNumRows()); - $this->assertCount(1, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); + $resultData = $result->getDataAsArray(); - $usersView = array_filter($users, function ($user) { + $this->assertCount(1, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + + $usersView = array_filter($resultData, function ($user) { return (int)$user->isEdit === 0; }); $this->assertCount(0, $usersView); - $usersEdit = array_filter($users, function ($user) { + $usersEdit = array_filter($resultData, function ($user) { return (int)$user->isEdit === 1; }); $this->assertCount(1, $usersEdit); - $users = self::$repository->getUsersByAccountId(2); + $result = self::$repository->getUsersByAccountId(2); + $this->assertEquals(1, $result->getNumRows()); - $this->assertCount(1, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); + $resultData = $result->getDataAsArray(); - $usersView = array_filter($users, function ($user) { + $this->assertCount(1, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + + $usersView = array_filter($resultData, function ($user) { return (int)$user->isEdit === 0; }); $this->assertCount(1, $usersView); - $usersEdit = array_filter($users, function ($user) { + $usersEdit = array_filter($resultData, function ($user) { return (int)$user->isEdit === 1; }); $this->assertCount(0, $usersEdit); - $users = self::$repository->getUsersByAccountId(3); - - $this->assertCount(0, $users); + $this->assertEquals(0, self::$repository->getUsersByAccountId(3)->getNumRows()); } /** @@ -126,15 +130,18 @@ class AccountToUserRepositoryTest extends DatabaseTestCase self::$repository->update($accountRequest); - $users = self::$repository->getUsersByAccountId($accountRequest->id); + $result = self::$repository->getUsersByAccountId($accountRequest->id); + $this->assertEquals(3, $result->getNumRows()); - $this->assertCount(3, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); - $this->assertEquals(0, (int)$users[0]->isEdit); - $this->assertInstanceOf(ItemData::class, $users[1]); - $this->assertEquals(0, (int)$users[1]->isEdit); - $this->assertInstanceOf(ItemData::class, $users[2]); - $this->assertEquals(0, (int)$users[2]->isEdit); + $resultData = $result->getDataAsArray(); + + $this->assertCount(3, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + $this->assertEquals(0, (int)$resultData[0]->isEdit); + $this->assertInstanceOf(ItemData::class, $resultData[1]); + $this->assertEquals(0, (int)$resultData[1]->isEdit); + $this->assertInstanceOf(ItemData::class, $resultData[2]); + $this->assertEquals(0, (int)$resultData[2]->isEdit); $this->expectException(ConstraintException::class); @@ -162,13 +169,16 @@ class AccountToUserRepositoryTest extends DatabaseTestCase self::$repository->updateEdit($accountRequest); - $users = self::$repository->getUsersByAccountId($accountRequest->id); + $result = self::$repository->getUsersByAccountId($accountRequest->id); + $this->assertEquals(2, $result->getNumRows()); - $this->assertCount(2, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); - $this->assertEquals(1, (int)$users[0]->isEdit); - $this->assertInstanceOf(ItemData::class, $users[1]); - $this->assertEquals(1, (int)$users[1]->isEdit); + $resultData = $result->getDataAsArray(); + + $this->assertCount(2, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + $this->assertEquals(1, (int)$resultData[0]->isEdit); + $this->assertInstanceOf(ItemData::class, $resultData[1]); + $this->assertEquals(1, (int)$resultData[1]->isEdit); $this->expectException(ConstraintException::class); @@ -193,7 +203,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase public function testDeleteByAccountId() { $this->assertEquals(1, self::$repository->deleteByAccountId(1)); - $this->assertCount(0, self::$repository->getUsersByAccountId(1)); + $this->assertEquals(0, self::$repository->getUsersByAccountId(1)->getNumRows()); $this->assertEquals(0, self::$repository->deleteByAccountId(10)); @@ -214,12 +224,15 @@ class AccountToUserRepositoryTest extends DatabaseTestCase self::$repository->addEdit($accountRequest); - $users = self::$repository->getUsersByAccountId($accountRequest->id); + $result = self::$repository->getUsersByAccountId($accountRequest->id); + $this->assertEquals(3, $result->getNumRows()); - $this->assertCount(3, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); - $this->assertInstanceOf(ItemData::class, $users[1]); - $this->assertInstanceOf(ItemData::class, $users[2]); + $resultData = $result->getDataAsArray(); + + $this->assertCount(3, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + $this->assertInstanceOf(ItemData::class, $resultData[1]); + $this->assertInstanceOf(ItemData::class, $resultData[2]); $this->expectException(ConstraintException::class); @@ -249,12 +262,15 @@ class AccountToUserRepositoryTest extends DatabaseTestCase self::$repository->add($accountRequest); - $users = self::$repository->getUsersByAccountId($accountRequest->id); + $result = self::$repository->getUsersByAccountId($accountRequest->id); + $this->assertEquals(3, $result->getNumRows()); - $this->assertCount(3, $users); - $this->assertInstanceOf(ItemData::class, $users[0]); - $this->assertInstanceOf(ItemData::class, $users[1]); - $this->assertInstanceOf(ItemData::class, $users[2]); + $resultData = $result->getDataAsArray(); + + $this->assertCount(3, $resultData); + $this->assertInstanceOf(ItemData::class, $resultData[0]); + $this->assertInstanceOf(ItemData::class, $resultData[1]); + $this->assertInstanceOf(ItemData::class, $resultData[2]); $this->expectException(ConstraintException::class); @@ -279,7 +295,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase public function testDeleteEditByAccountId() { $this->assertEquals(1, self::$repository->deleteEditByAccountId(1)); - $this->assertCount(0, self::$repository->getUsersByAccountId(1)); + $this->assertEquals(0, self::$repository->getUsersByAccountId(1)->getNumRows()); $this->assertEquals(0, self::$repository->deleteEditByAccountId(10)); diff --git a/tests/SP/Services/Track/TrackServiceTest.php b/tests/SP/Services/Track/TrackServiceTest.php index 9afd74f2..373234be 100644 --- a/tests/SP/Services/Track/TrackServiceTest.php +++ b/tests/SP/Services/Track/TrackServiceTest.php @@ -106,6 +106,7 @@ class TrackServiceTest extends DatabaseTestCase /** * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\InvalidArgumentException * @throws \SP\Core\Exceptions\QueryException */ public function testGetAll() @@ -125,6 +126,7 @@ class TrackServiceTest extends DatabaseTestCase /** * @throws NoSuchItemException * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\InvalidArgumentException * @throws \SP\Core\Exceptions\QueryException */ public function testGetById() diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml index 2b887800..8e203313 100644 --- a/tests/res/config/config.xml +++ b/tests/res/config/config.xml @@ -9,11 +9,11 @@ 1 1 - aac98603ec5e4687b1c7aa4698d46f4ed0d1f69a + dcb833cd3fbe28efe1702f066c6388e0aeeaa51c 0 0 - 1535672911 - c2bcaa6196a692aaf3a7dfee49186b577d44efcc + 1535830048 + 3de9cc9c7fbc82a96a65bb93850cbf5cdbf907c2 @@ -32,7 +32,7 @@ 0 - 7e54c872dca490dfbfae83baf6d045ccf92f2073 + ebe55b2571722b1f27c0ad259ad386d87defd119 PDF JPG