From 596f67ceed6ec17e419b7ff532bf94f7d4fd5ebc Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Thu, 29 Mar 2018 20:58:25 +0200 Subject: [PATCH] * [ADD] Show up account ID within details tab. Related #864 * [ADD] New special filter by account ID. Related #864 --- app/locales/en_US/LC_MESSAGES/messages.mo | Bin 97882 -> 97962 bytes app/locales/en_US/LC_MESSAGES/messages.po | 190 +++++++++--------- .../material-blue/views/account/details.inc | 8 + .../views/account/search-searchbox.inc | 1 + .../Services/Account/AccountSearchService.php | 37 ++-- 5 files changed, 132 insertions(+), 104 deletions(-) diff --git a/app/locales/en_US/LC_MESSAGES/messages.mo b/app/locales/en_US/LC_MESSAGES/messages.mo index 5bc0912f369b5a3f674555f99e362b80b1ce678c..8b7f43fa0c21d8e6ba6a865254e946c28122a87c 100644 GIT binary patch delta 27974 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 diff --git a/app/locales/en_US/LC_MESSAGES/messages.po b/app/locales/en_US/LC_MESSAGES/messages.po index a71fc7d1..5b5c2121 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-03-26 13:40+0100\n" -"PO-Revision-Date: 2018-03-26 13:43+0100\n" +"POT-Creation-Date: 2018-03-29 20:56+0100\n" +"PO-Revision-Date: 2018-03-29 20:57+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_US\n" @@ -44,6 +44,8 @@ msgstr "View password" #: ../../../../lib/SP/Api/SyspassApi.php:84 #: ../../../modules/web/Controllers/Helpers/ItemsGridHelper.php:1220 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:138 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:140 msgid "ID" msgstr "ID" @@ -344,12 +346,12 @@ msgstr "Client Id" #: ../../../modules/web/themes/material-blue/views/itemshow/authtoken.inc:47 #: ../../../modules/web/themes/material-blue/views/itemshow/authtoken.inc:54 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:116 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:123 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:124 #: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:38 -#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:44 +#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:45 #: ../../../modules/web/themes/material-blue/views/login/index.inc:26 -#: ../../../modules/web/themes/material-blue/views/login/index.inc:86 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:14 +#: ../../../modules/web/themes/material-blue/views/login/index.inc:88 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:20 msgid "Clave" msgstr "Password" @@ -372,7 +374,7 @@ msgstr "Access URL or IP" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:124 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:78 #: ../../../modules/web/themes/material-blue/views/account/account.inc:201 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:149 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:151 msgid "Notas sobre la cuenta" msgstr "Notes about the account" @@ -444,14 +446,14 @@ msgstr "The LDAP parameters are not set" #: ../../../../lib/SP/Controller/ChecksController.php:107 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapBase.php:123 -#: ../../../modules/web/Controllers/ConfigLdapController.php:147 -#: ../../../modules/web/Controllers/ConfigLdapController.php:190 +#: ../../../modules/web/Controllers/ConfigLdapController.php:152 +#: ../../../modules/web/Controllers/ConfigLdapController.php:195 msgid "Conexión a LDAP correcta" msgstr "LDAP connection OK" #: ../../../../lib/SP/Controller/ChecksController.php:108 -#: ../../../modules/web/Controllers/ConfigLdapController.php:148 -#: ../../../modules/web/Controllers/ConfigLdapController.php:191 +#: ../../../modules/web/Controllers/ConfigLdapController.php:153 +#: ../../../modules/web/Controllers/ConfigLdapController.php:196 #, php-format msgid "Objetos encontrados: %d" msgstr "Objects found: %d" @@ -609,7 +611,7 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/login/index.inc:84 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:68 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:70 -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:14 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:19 msgid "Usuario" msgstr "User" @@ -827,7 +829,7 @@ msgstr "Error while searching the group RDN" #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:136 #: ../../../modules/web/Controllers/Helpers/ItemsGridHelper.php:556 #: ../../../modules/web/Controllers/UserGroupController.php:215 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:131 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:130 #: ../../../modules/web/themes/material-blue/views/_partials/footer.inc:15 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:246 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:249 @@ -2010,13 +2012,13 @@ msgid "Error al enviar correo" msgstr "Error while sending the email" #: ../../../../lib/SP/Services/MailService.php:140 -#: ../../../modules/web/Controllers/ConfigMailController.php:134 -#: ../../../modules/web/Controllers/ConfigMailController.php:140 +#: ../../../modules/web/Controllers/ConfigMailController.php:139 +#: ../../../modules/web/Controllers/ConfigMailController.php:145 msgid "Correo enviado" msgstr "Email sent" #: ../../../../lib/SP/Services/MailService.php:141 -#: ../../../modules/web/Controllers/ConfigMailController.php:135 +#: ../../../modules/web/Controllers/ConfigMailController.php:140 msgid "Destinatario" msgstr "Recipient" @@ -2179,7 +2181,7 @@ msgstr "Error while deleting the groups" #: ../../../modules/web/Controllers/UserController.php:200 #: ../../../modules/web/Controllers/UserController.php:314 #: ../../../modules/web/Controllers/UserPassResetController.php:106 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:184 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:186 msgid "Cambio de Clave" msgstr "Password Change" @@ -2769,7 +2771,7 @@ msgstr "Public links disabled" #: ../../../modules/web/Controllers/ConfigEncryptionController.php:98 #: ../../../modules/web/Controllers/ConfigEncryptionController.php:160 #: ../../../modules/web/Controllers/ConfigImportController.php:57 -#: ../../../modules/web/Controllers/ConfigLdapController.php:211 +#: ../../../modules/web/Controllers/ConfigLdapController.php:216 #: ../../../modules/web/Controllers/Traits/ConfigTrait.php:53 #: ../../../modules/web/Forms/UserForm.php:131 #: ../../../modules/web/Forms/UserForm.php:143 @@ -2875,19 +2877,19 @@ msgstr "Remote syslog disabled" msgid "Faltan parámetros de Proxy" msgstr "Missing Proxy parameters " -#: ../../../modules/web/Controllers/ConfigGeneralController.php:127 +#: ../../../modules/web/Controllers/ConfigGeneralController.php:130 msgid "Proxy habiltado" msgstr "Proxy enabled" -#: ../../../modules/web/Controllers/ConfigGeneralController.php:132 +#: ../../../modules/web/Controllers/ConfigGeneralController.php:135 msgid "Proxy deshabilitado" msgstr "Proxy disabled" -#: ../../../modules/web/Controllers/ConfigGeneralController.php:151 +#: ../../../modules/web/Controllers/ConfigGeneralController.php:154 msgid "Auth Basic habilitada" msgstr "Auth Basic enabled" -#: ../../../modules/web/Controllers/ConfigGeneralController.php:157 +#: ../../../modules/web/Controllers/ConfigGeneralController.php:160 msgid "Auth Basic deshabiltada" msgstr "Auth Basic disabled" @@ -2896,7 +2898,7 @@ msgid "Cuentas importadas" msgstr "Accounts imported" #: ../../../modules/web/Controllers/ConfigImportController.php:81 -#: ../../../modules/web/Controllers/ConfigLdapController.php:251 +#: ../../../modules/web/Controllers/ConfigLdapController.php:256 msgid "Importación finalizada" msgstr "Import finished" @@ -2905,65 +2907,71 @@ msgid "No se importaron cuentas" msgstr "No accounts were imported" #: ../../../modules/web/Controllers/ConfigLdapController.php:69 -#: ../../../modules/web/Controllers/ConfigLdapController.php:132 -#: ../../../modules/web/Controllers/ConfigLdapController.php:168 +#: ../../../modules/web/Controllers/ConfigLdapController.php:137 +#: ../../../modules/web/Controllers/ConfigLdapController.php:173 msgid "Faltan parámetros de LDAP" msgstr "Missing LDAP parameters" -#: ../../../modules/web/Controllers/ConfigLdapController.php:84 +#: ../../../modules/web/Controllers/ConfigLdapController.php:87 msgid "LDAP habiltado" msgstr "LDAP enabled" -#: ../../../modules/web/Controllers/ConfigLdapController.php:89 +#: ../../../modules/web/Controllers/ConfigLdapController.php:92 msgid "LDAP deshabilitado" msgstr "LDAP disabled" -#: ../../../modules/web/Controllers/ConfigLdapController.php:109 -#: ../../../modules/web/Controllers/ConfigLdapController.php:231 +#: ../../../modules/web/Controllers/ConfigLdapController.php:94 +#: ../../../modules/web/Controllers/ConfigMailController.php:103 +#: ../../../config/strings.js.inc:80 +msgid "Sin cambios" +msgstr "No changes" + +#: ../../../modules/web/Controllers/ConfigLdapController.php:114 +#: ../../../modules/web/Controllers/ConfigLdapController.php:236 msgid "Parámetros de LDAP incorrectos" msgstr "Wrong LDAP parameters" -#: ../../../modules/web/Controllers/ConfigLdapController.php:142 -#: ../../../modules/web/Controllers/ConfigLdapController.php:184 +#: ../../../modules/web/Controllers/ConfigLdapController.php:147 +#: ../../../modules/web/Controllers/ConfigLdapController.php:189 msgid "Resultados" msgstr "Results" -#: ../../../modules/web/Controllers/ConfigLdapController.php:237 +#: ../../../modules/web/Controllers/ConfigLdapController.php:242 msgid "Importación LDAP" msgstr "LDAP Import" -#: ../../../modules/web/Controllers/ConfigLdapController.php:255 +#: ../../../modules/web/Controllers/ConfigLdapController.php:260 msgid "No se encontraron objetos para sincronizar" msgstr "There aren't any objects to synchronize" -#: ../../../modules/web/Controllers/ConfigLdapController.php:260 +#: ../../../modules/web/Controllers/ConfigLdapController.php:265 msgid "Importación de usuarios de LDAP realizada" msgstr "LDAP users import finished" -#: ../../../modules/web/Controllers/ConfigLdapController.php:262 +#: ../../../modules/web/Controllers/ConfigLdapController.php:267 #, php-format msgid "Usuarios importados: %d / %d" msgstr "Imported users: %d / %d" -#: ../../../modules/web/Controllers/ConfigLdapController.php:263 +#: ../../../modules/web/Controllers/ConfigLdapController.php:268 #, php-format msgid "Errores: %d" msgstr "Errors: %d" #: ../../../modules/web/Controllers/ConfigMailController.php:69 -#: ../../../modules/web/Controllers/ConfigMailController.php:121 +#: ../../../modules/web/Controllers/ConfigMailController.php:126 msgid "Faltan parámetros de Correo" msgstr "Missing Mail parameters" -#: ../../../modules/web/Controllers/ConfigMailController.php:91 +#: ../../../modules/web/Controllers/ConfigMailController.php:94 msgid "Correo habiltado" msgstr "Mail enabled" -#: ../../../modules/web/Controllers/ConfigMailController.php:98 +#: ../../../modules/web/Controllers/ConfigMailController.php:101 msgid "Correo deshabilitado" msgstr "Mail disabled" -#: ../../../modules/web/Controllers/ConfigMailController.php:141 +#: ../../../modules/web/Controllers/ConfigMailController.php:146 msgid "Compruebe su buzón de correo" msgstr "Please, check your inbox" @@ -3392,8 +3400,8 @@ msgstr "Edit User" #: ../../../modules/web/Controllers/Helpers/ItemsGridHelper.php:648 #: ../../../modules/web/Controllers/Helpers/ItemsGridHelper.php:649 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:61 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:115 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:120 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:114 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:119 msgid "Cambiar Clave de Usuario" msgstr "Change User's Password" @@ -4128,12 +4136,12 @@ msgid "Cambiar Clave" msgstr "Change Password" #: ../../../modules/web/themes/material-blue/inc/Icons.php:40 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:162 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:164 msgid "Admin Aplicación" msgstr "Application Admin" #: ../../../modules/web/themes/material-blue/inc/Icons.php:41 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:169 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:171 msgid "Admin Cuentas" msgstr "Accounts Admin" @@ -4142,8 +4150,8 @@ msgid "Usuario de LDAP" msgstr "LDAP User" #: ../../../modules/web/themes/material-blue/inc/Icons.php:43 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:174 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:177 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:176 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:179 msgid "Deshabilitado" msgstr "Disabled" @@ -4173,8 +4181,8 @@ msgstr "Email" #: ../../../modules/web/themes/material-blue/views/error/error-database.inc:14 #: ../../../modules/web/themes/material-blue/views/error/error-maintenance.inc:13 #: ../../../modules/web/themes/material-blue/views/error/error-maintenance.inc:14 -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:33 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:34 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:41 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:44 msgid "Volver" msgstr "Back" @@ -4336,14 +4344,14 @@ msgstr "Select Profile" #: ../../../config/strings.js.inc:50 #: ../../../modules/web/themes/material-blue/views/account/account.inc:79 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:50 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:51 msgid "Seleccionar Cliente" msgstr "Select Client" #: ../../../config/strings.js.inc:51 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:68 #: ../../../modules/web/themes/material-blue/views/account/account.inc:103 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:59 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:60 msgid "Seleccionar Categoría" msgstr "Select Category" @@ -4449,14 +4457,10 @@ msgid "Mostrar Favoritos" msgstr "Show Favorites" #: ../../../config/strings.js.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:73 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:74 msgid "Mostrar Todos" msgstr "Show All" -#: ../../../config/strings.js.inc:80 -msgid "Sin cambios" -msgstr "No changes" - #: ../../../config/strings.js.inc:81 msgid "Ahora" msgstr "Now" @@ -4519,28 +4523,28 @@ msgid "Javascript es necesario para el correcto funcionamiento" msgstr "Javascript is needed in order to run correctly" #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:40 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:106 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:105 #, php-format msgid "Hay %d notificaciones pendientes" msgstr "There are %d unread notifications" #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:42 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:108 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:107 msgid "No hay no hay notificaciones pendientes" msgstr "There aren't any pending notifications" #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:68 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:125 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:124 msgid "Preferencias de usuario" msgstr "User preferences" #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:72 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:139 -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:142 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:138 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:141 msgid "Salir" msgstr "Sign Out" -#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:152 +#: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:151 #: ../../../modules/web/themes/material-blue/views/_partials/footer.inc:43 msgid "Demo" msgstr "Demo" @@ -4568,11 +4572,11 @@ msgstr "A cygnux.org project" #: ../../../modules/web/themes/material-blue/views/account/account.inc:161 #: ../../../modules/web/themes/material-blue/views/account/account.inc:168 #: ../../../modules/web/themes/material-blue/views/install/index.inc:61 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:129 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:136 -#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:50 -#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:57 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:22 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:131 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:138 +#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:52 +#: ../../../modules/web/themes/material-blue/views/itemshow/userpass.inc:59 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:31 msgid "Clave (repetir)" msgstr "Password (repeat)" @@ -4593,7 +4597,7 @@ msgstr "Details" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:117 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:71 #: ../../../modules/web/themes/material-blue/views/account/account.inc:194 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:143 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:145 msgid "Notas" msgstr "Notes" @@ -4613,8 +4617,8 @@ msgstr "Select date" #: ../../../modules/web/themes/material-blue/views/account/account.inc:265 #: ../../../modules/web/themes/material-blue/views/account/details.inc:27 #: ../../../modules/web/themes/material-blue/views/account/details.inc:29 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:213 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:215 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:217 msgid "Última Modificación" msgstr "Last Modification" @@ -4805,26 +4809,30 @@ msgstr "Search for accounts with expired password" msgid "Devolver las cuentas privadas del usuario actual" msgstr "Get the private accounts for the current user" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:40 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:44 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:33 +msgid "Devolver la cuenta con ID" +msgstr "Returns the account for then given ID" + +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:41 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/userprofile.inc:226 #: ../../../modules/web/themes/material-blue/views/itemshow/userprofile.inc:227 msgid "Búsqueda global" msgstr "Global searching" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:76 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:77 msgid "Filtrar Favoritos" msgstr "Favorites Filtering" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:90 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:91 msgid "Cuentas por página" msgstr "Accounts per page" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:96 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:97 msgid "Más Filtros" msgstr "More Filters" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:101 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:102 msgid "Seleccionar Etiqueta" msgstr "Select Tag" @@ -5120,7 +5128,7 @@ msgstr "" #: ../../../modules/web/themes/material-blue/views/install/index.inc:47 #: ../../../modules/web/themes/material-blue/views/install/index.inc:53 #: ../../../modules/web/themes/material-blue/views/login/index.inc:48 -#: ../../../modules/web/themes/material-blue/views/login/index.inc:87 +#: ../../../modules/web/themes/material-blue/views/login/index.inc:92 msgid "Clave Maestra" msgstr "Master Password" @@ -5999,7 +6007,7 @@ 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/authtoken.inc:59 -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:155 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:157 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:85 msgid "Opciones" msgstr "Options" @@ -6102,30 +6110,30 @@ msgstr "Session login with SSO" msgid "Dirección de correo" msgstr "Email address" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:159 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:161 msgid "Administrador de la aplicación" msgstr "Application administrator" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:166 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:168 msgid "Administrador de cuentas" msgstr "Accounts administrator" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:181 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:183 msgid "Forzar cambio de clave" msgstr "Force password change" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:195 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:197 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:199 msgid "Entradas" msgstr "Entries" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:204 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:206 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:208 msgid "Último Acceso" msgstr "Last Access" -#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:222 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:224 +#: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:226 msgid "Fecha Clave Maestra" msgstr "Master Password Date" @@ -6415,27 +6423,27 @@ msgstr "The application needs to be updated" msgid "Para iniciar la actualización introduzca el código de seguridad" msgstr "Please enter the security code to start the upgrade" -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:7 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:7 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:6 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:6 msgid "Solicitud de Cambio de Clave" msgstr "Request Password Change" -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:22 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:29 msgid "Email del Usuario" msgstr "User's Email" -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:32 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:33 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:40 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:43 msgid "Volver a iniciar sesión" msgstr "Go back to login" -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:37 -#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:39 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:45 +#: ../../../modules/web/themes/material-blue/views/userpassreset/request.inc:47 msgid "Solicitar" msgstr "Request" -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:38 -#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:40 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:48 +#: ../../../modules/web/themes/material-blue/views/userpassreset/reset.inc:50 msgid "Cambiar" msgstr "Change" diff --git a/app/modules/web/themes/material-blue/views/account/details.inc b/app/modules/web/themes/material-blue/views/account/details.inc index 69140c12..6f4ea532 100644 --- a/app/modules/web/themes/material-blue/views/account/details.inc +++ b/app/modules/web/themes/material-blue/views/account/details.inc @@ -134,5 +134,13 @@ + + + +
+ + getId(); ?> + + diff --git a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc index 1029aa84..3434c290 100644 --- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc +++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc @@ -30,6 +30,7 @@
  • file:"file_name"
    %s', __('Buscar cuentas con archivos con el nombre \'file_name\'')); ?>
  • expired:
    %s', __('Buscar cuentas con la clave caducada')); ?>
  • private:
    %s', __('Devolver las cuentas privadas del usuario actual')); ?>
    • +
  • id:"account_id"
    %s', __('Devolver la cuenta con ID')); ?>
    • diff --git a/lib/SP/Services/Account/AccountSearchService.php b/lib/SP/Services/Account/AccountSearchService.php index 6f7af228..c8668644 100644 --- a/lib/SP/Services/Account/AccountSearchService.php +++ b/lib/SP/Services/Account/AccountSearchService.php @@ -51,7 +51,7 @@ class AccountSearchService extends Service /** * Regex filter for special searching */ - const FILTERS_REGEX = '^(?user|group|file|owner|maingroup|expired|private):(?:"(?[\w\.]+)")?$'; + const FILTERS_REGEX = '^(?id|user|group|file|owner|maingroup|expired|private):(?:"(?[\w\.]+)")?$'; const COLORS_CACHE_FILE = CACHE_PATH . DIRECTORY_SEPARATOR . 'colors.cache'; @@ -187,13 +187,13 @@ class AccountSearchService extends Service return []; } - $text = empty($filters['text']) === false ? $filters['text'] : false; + $filter = empty($filters['filter']) === false ? $filters['filter'] : false; try { - switch ($filters['filter']) { + switch ($filters['type']) { case 'user': - if ($text === false - || is_object(($userData = $this->dic->get(UserService::class)->getByLogin($text))) === false) { + if ($filter === false + || is_object(($userData = $this->dic->get(UserService::class)->getByLogin($filter))) === false) { return []; } @@ -204,19 +204,19 @@ class AccountSearchService extends Service ]; break; case 'owner': - if ($text === false) { + if ($filter === false) { return []; } return [ 'type' => 'user', 'query' => 'A.userLogin LIKE ?', - 'values' => ['%' . $text . '%'] + 'values' => ['%' . $filter . '%'] ]; break; case 'group': - if ($text === false - || is_object(($userGroupData = $this->dic->get(UserGroupService::class)->getByName($text))) === false) { + if ($filter === false + || is_object(($userGroupData = $this->dic->get(UserGroupService::class)->getByName($filter))) === false) { return []; } @@ -227,25 +227,25 @@ class AccountSearchService extends Service ]; break; case 'maingroup': - if ($text === false) { + if ($filter === false) { return []; } return [ 'type' => 'group', 'query' => 'A.userGroupName = ?', - 'values' => ['%' . $text . '%'] + 'values' => ['%' . $filter . '%'] ]; break; case 'file': - if ($text === false) { + if ($filter === false) { return []; } return [ 'type' => 'file', 'query' => 'A.id IN (SELECT AF.accountId FROM AccountFile AF WHERE AF.name LIKE ?)', - 'values' => ['%' . $text . '%'] + 'values' => ['%' . $filter . '%'] ]; break; case 'expired': @@ -262,6 +262,17 @@ class AccountSearchService extends Service 'values' => [$this->context->getUserData()->getId(), $this->context->getUserData()->getUserGroupId()] ]; break; + case 'id': + if ($filter === false) { + return []; + } + + return [ + 'type' => 'id', + 'query' => 'A.id = ?', + 'values' => [(int)$filter] + ]; + break; default: return []; }