From 8a06e686bbbf9f90d958d03a281a38dd8e8ea0a8 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Thu, 20 Oct 2016 11:29:35 +0200 Subject: [PATCH 1/3] NavigationItemForm: Update translation to fit updated Url class refs #12890 --- .../forms/Navigation/NavigationItemForm.php | 2 +- .../locale/de_DE/LC_MESSAGES/icinga.mo | Bin 60998 -> 61126 bytes .../locale/de_DE/LC_MESSAGES/icinga.po | 12 +++++------- .../locale/it_IT/LC_MESSAGES/icinga.mo | Bin 56908 -> 56530 bytes .../locale/it_IT/LC_MESSAGES/icinga.po | 10 ---------- .../locale/ru_RU/LC_MESSAGES/icinga.po | 10 ---------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/application/forms/Navigation/NavigationItemForm.php b/application/forms/Navigation/NavigationItemForm.php index 61fd7428f..d46b3b3cd 100644 --- a/application/forms/Navigation/NavigationItemForm.php +++ b/application/forms/Navigation/NavigationItemForm.php @@ -54,7 +54,7 @@ class NavigationItemForm extends Form 'label' => $this->translate('Url'), 'description' => $this->translate( 'The url of this navigation item. Leave blank if you only want the' - . ' name being displayed. For external urls, make sure to prepend' + . ' name being displayed. For internal urls with password and username in them and for all external urls, make sure to prepend' . ' an appropriate protocol identifier (e.g. http://example.tld)' ) ) diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.mo b/application/locale/de_DE/LC_MESSAGES/icinga.mo index 3413b7cbff069bdec8a4239867b2db1b767e0dea..50d8eadf2bd493613a1d8b0a7dd010b0fb8fa8fd 100644 GIT binary patch delta 5997 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 delta 10699 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 WNmISksw&63JC0WFUV5}N^nU?ieOMm= diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po index 1550ef138..6746860cd 100644 --- a/application/locale/it_IT/LC_MESSAGES/icinga.po +++ b/application/locale/it_IT/LC_MESSAGES/icinga.po @@ -2517,16 +2517,6 @@ msgstr "Tipo del backend gruppo utenti" msgid "The unique name of this resource" msgstr "Nome univoco per questa risorsa" -#: /usr/share/icingaweb2/application/forms/Navigation/NavigationItemForm.php:56 -msgid "" -"The url of this navigation item. Leave blank if you only want the name being " -"displayed. For external urls, make sure to prepend an appropriate protocol " -"identifier (e.g. http://example.tld)" -msgstr "" -"La url di questo oggetto di navigazione. Lasciare vuoto se si vuole solo " -"mostrare il nome. Per url esterne ricordare di anteporre l'appropriato " -"identificatore di protocollo (ex. http://esempio.tld)" - #: /usr/share/icingaweb2/application/forms/Navigation/DashletForm.php:29 msgid "" "The url to load in the dashlet. For external urls, make sure to prepend an " diff --git a/application/locale/ru_RU/LC_MESSAGES/icinga.po b/application/locale/ru_RU/LC_MESSAGES/icinga.po index e27f63e9c..c43e1cdd2 100644 --- a/application/locale/ru_RU/LC_MESSAGES/icinga.po +++ b/application/locale/ru_RU/LC_MESSAGES/icinga.po @@ -2417,16 +2417,6 @@ msgstr "" msgid "The unique name of this resource" msgstr "Уникальное название ресурса" -#: /vagrant/application/forms/Navigation/NavigationItemForm.php:56 -msgid "" -"The url of this navigation item. Leave blank if you only want the name being " -"displayed. For external urls, make sure to prepend an appropriate protocol " -"identifier (e.g. http://example.tld)" -msgstr "" -"URL адрес элемента навигации. Оставьте пустым, если необходимо только " -"отображение имени. Для внешних адресов убедитесь, что в начале ссылке указан " -"корректный протокол (например, http://example.tld)" - #: /vagrant/application/forms/Navigation/DashletForm.php:29 msgid "" "The url to load in the dashlet. For external urls, make sure to prepend an " From 366064e21fd44302abae13a3684c25d90c0b905e Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Tue, 25 Oct 2016 13:37:31 +0200 Subject: [PATCH 2/3] NavigationItemForm: Improve translation refs #12890 --- .../forms/Navigation/NavigationItemForm.php | 6 +++--- .../locale/de_DE/LC_MESSAGES/icinga.mo | Bin 61126 -> 61085 bytes .../locale/de_DE/LC_MESSAGES/icinga.po | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/forms/Navigation/NavigationItemForm.php b/application/forms/Navigation/NavigationItemForm.php index d46b3b3cd..4f2df85cc 100644 --- a/application/forms/Navigation/NavigationItemForm.php +++ b/application/forms/Navigation/NavigationItemForm.php @@ -53,9 +53,9 @@ class NavigationItemForm extends Form 'allowEmpty' => true, 'label' => $this->translate('Url'), 'description' => $this->translate( - 'The url of this navigation item. Leave blank if you only want the' - . ' name being displayed. For internal urls with password and username in them and for all external urls, make sure to prepend' - . ' an appropriate protocol identifier (e.g. http://example.tld)' + 'The url of this navigation item. Leave blank if only the name should be displayed.' + . ' For urls with username and password and for all external urls,' + . ' make sure to prepend an appropriate protocol identifier (e.g. http://example.tld)' ) ) ); diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.mo b/application/locale/de_DE/LC_MESSAGES/icinga.mo index 50d8eadf2bd493613a1d8b0a7dd010b0fb8fa8fd..d6f05c01e5045a61cade2e5c9b7c4e5fb8ea89f0 100644 GIT binary patch delta 5927 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 delta 5929 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 diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.po b/application/locale/de_DE/LC_MESSAGES/icinga.po index 8addee6ef..f99ff565c 100644 --- a/application/locale/de_DE/LC_MESSAGES/icinga.po +++ b/application/locale/de_DE/LC_MESSAGES/icinga.po @@ -2564,12 +2564,12 @@ msgstr "Der eindeutige Name dieser Ressource" #: /vagrant/application/forms/Navigation/NavigationItemForm.php:56 msgid "" -"The url of this navigation item. Leave blank if you only want the name being displayed. For internal urls with password and username in " -"them and for all external urls, make sure to prepend an appropriate protocol identifier (e.g. http://example.tld)" +"The url of this navigation item. Leave blank if only the name should be displayed. For urls with username and password and " +"for all external urls, make sure to prepend an appropriate protocol identifier (e.g. http://example.tld)" msgstr "" -"Die URL dieses Navigationselementes. Dies kann leer gelassen werden, wenn nur der Name angezeigt werden soll. Stellen Sie für alle " -"internen URLs mit Passwort und Benutzername sowie alle externen URLs sicher, dass Sie einen passenden Protokollnamen voran stellen (z." -"B. http://example.tld)" +"Die URL dieses Navigationselementes. Dies kann leer gelassen werden, wenn nur der Name angezeigt werden soll. Stelle für URLs " +"mit Benutzername und Passwort sowie alle externen URLs sicher, dass eine passender Protokollnamen voran gestellt ist (z.B. " +"http://example.tld)" #: /vagrant/application/forms/Navigation/DashletForm.php:29 msgid "" From 6492f3c105a0fc97db91e6933f94b9c7001ff228 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Fri, 28 Oct 2016 10:36:13 +0200 Subject: [PATCH 3/3] NavigationItemForm: Validate that urls with credentials contain a protocol refs #12890 --- .../forms/Navigation/NavigationItemForm.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/application/forms/Navigation/NavigationItemForm.php b/application/forms/Navigation/NavigationItemForm.php index 4f2df85cc..44f16488c 100644 --- a/application/forms/Navigation/NavigationItemForm.php +++ b/application/forms/Navigation/NavigationItemForm.php @@ -56,6 +56,24 @@ class NavigationItemForm extends Form 'The url of this navigation item. Leave blank if only the name should be displayed.' . ' For urls with username and password and for all external urls,' . ' make sure to prepend an appropriate protocol identifier (e.g. http://example.tld)' + ), + 'validators' => array( + array( + 'Callback', + false, + array( + 'callback' => function($url) { + // Matches if the given url contains obviously + // a username but not any protocol identifier + return !preg_match('#^((?=[^/@]).)+@.*$#', $url); + }, + 'messages' => array( + 'callbackValue' => $this->translate( + 'Missing protocol identifier' + ) + ) + ) + ) ) ) );