From 4668e8a9541328139ebefea3e463a68b6f6a99f1 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 22 Nov 2018 14:16:31 +0400 Subject: [PATCH 01/21] fix escape lightbox --- templates/web/lightbox/index.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/lightbox/index.html.twig b/templates/web/lightbox/index.html.twig index 9ff76249e1..70fb42608b 100644 --- a/templates/web/lightbox/index.html.twig +++ b/templates/web/lightbox/index.html.twig @@ -51,7 +51,7 @@

- {{basket.getName()|raw}} + {{basket.getName()|e}}

{% if basket.getValidation().isFinished() %} {{ '(validation) session terminee' | trans }} @@ -116,7 +116,7 @@

- {{ basket.getName()|raw}} + {{ basket.getName()|e}}

From 06e30750e4006c535aad0c016ecb3f6ec6569ea7 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 22 Nov 2018 14:21:12 +0400 Subject: [PATCH 02/21] fix escape in admin connected-user --- templates/web/admin/connected-users.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/admin/connected-users.html.twig b/templates/web/admin/connected-users.html.twig index 9477e20edf..4b784a385f 100644 --- a/templates/web/admin/connected-users.html.twig +++ b/templates/web/admin/connected-users.html.twig @@ -94,7 +94,7 @@ {% for session in data['sessions'] %} {% set row = session['session'] %} - + {% if row.getId() == app['session'].get('session_id') %} {{ row.getUser().getDisplayName() }} From c58ed453334a0dd5ae4bd5d0a23a85e65ca36dc2 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 22 Nov 2018 14:32:42 +0400 Subject: [PATCH 03/21] fix prod escaping --- lib/Alchemy/Phrasea/Controller/Prod/PushController.php | 2 +- lib/classes/record/adapter.php | 2 +- lib/classes/record/preview.php | 4 ++-- templates/web/prod/WorkZone/Macros.html.twig | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php index 569537fed3..35b3a3bc42 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php @@ -597,7 +597,7 @@ class PushController extends Controller private function formatUser(User $user) { - $subtitle = array_filter([$user->getJob(), $user->getCompany()]); + $subtitle = array_filter([htmlspecialchars($user->getJob()), htmlspecialchars($user->getCompany())]); return [ 'type' => 'USER', diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index e49904424a..37320f64a3 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -939,7 +939,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface $this->set_data_to_cache(self::CACHE_TITLE, $title); } - return $title; + return htmlspecialchars($title); } /** diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index dd0ae0fe43..1c88f6e94e 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -149,7 +149,7 @@ class record_preview extends record_adapter $this->original_item = $element; $sbas_id = $element->getSbasId(); $record_id = $element->getRecordId(); - $this->name = $Basket->getName(); + $this->name = htmlspecialchars($Basket->getName()); $number = $element->getOrd(); $first = false; } @@ -169,7 +169,7 @@ class record_preview extends record_adapter if ($element->getOrd() == $pos || $first) { $sbas_id = $element->getSbasId(); $record_id = $element->getRecordId(); - $this->name = $entry->getTitle(); + $this->name = htmlspecialchars($entry->getTitle()); $this->original_item = $element; $number = $element->getOrd(); $first = false; diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 04f3d3d735..7aa678ba6b 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -19,7 +19,7 @@ {% endif %} - {{basket.getName()}} + {{basket.getName()|e}}
@@ -99,7 +99,7 @@ {% else %} {% endif %} - {{basket.getName()}} + {{basket.getName()|e}}
From 6fe39113c0f813bda98e00999dfe9e743c5a6335 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 22 Nov 2018 15:10:38 +0400 Subject: [PATCH 04/21] fix escaping in thesaurus --- .../Thesaurus/ThesaurusController.php | 4 ++-- .../Thesaurus/ThesaurusXmlHttpController.php | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php index a278a516d7..0e9704b576 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php @@ -2128,7 +2128,7 @@ class ThesaurusController extends Controller $sy = $sy_list->appendChild($ret->createElement("sy")); $sy->setAttribute("id", $n->getAttribute("id")); - $sy->setAttribute("v", $t = $n->getAttribute("v")); + $sy->setAttribute("v", htmlspecialchars($t = $n->getAttribute("v"))); $sy->setAttribute("w", $n->getAttribute("w")); $sy->setAttribute("hits", ''); $sy->setAttribute("lng", $lng = $n->getAttribute("lng")); @@ -2177,7 +2177,7 @@ class ThesaurusController extends Controller $firstsy = $goodsy = null; for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { - $t = $n2->getAttribute("v"); + $t = htmlspecialchars($n2->getAttribute("v")); if (! $firstsy) { $firstsy = $t; } diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php index b5a2ff441e..8662681991 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php @@ -252,7 +252,7 @@ class ThesaurusXmlHttpController extends Controller /** @var DOMElement $n2 */ for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { - $sy = $n2->getAttribute("v"); + $sy = htmlspecialchars($n2->getAttribute("v")); if (!$firstsy) { $firstsy = $sy; if ($request->get("debug")) { @@ -441,7 +441,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { $lng = $n2->getAttribute("lng"); - $t = $n2->getAttribute("v"); + $t = htmlspecialchars($n2->getAttribute("v")); $ksy = $n2->getAttribute("w"); if ($k = $n2->getAttribute("k")) { $ksy .= " ($k)"; @@ -586,7 +586,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { $lng = $n2->getAttribute("lng"); - $t = $n2->getAttribute("v"); + $t = htmlspecialchars($n2->getAttribute("v")); $ksy = $n2->getAttribute("w"); if ($k = $n2->getAttribute("k")) { $ksy .= " ($k)"; @@ -843,7 +843,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == 'sy') { $lng = $n2->getAttribute('lng'); - $t = $n2->getAttribute('v'); + $t = htmlspecialchars($n2->getAttribute('v')); $key = $n2->getAttribute('w'); // key of the current sy if ($k = $n2->getAttribute('k')) { $key .= ' (' . $k . ')'; @@ -920,7 +920,7 @@ class ThesaurusXmlHttpController extends Controller $bid = $request->get('bid'); for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); $tid = $n->getAttribute('id'); $html .= '

'; @@ -967,7 +967,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = ''; for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); if ($n->getAttribute('bold')) { $allsy .= ( $allsy ? ' ; ' : '') . 'getAttribute('id') . '\'>' . $t . ''; } else { @@ -1078,12 +1078,12 @@ class ThesaurusXmlHttpController extends Controller $ret['result'] = array(); for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); $tid = $n->getAttribute('id'); $ret['result'][] = array( 'id' => $n->getAttribute('id'), - 't' => $n->getAttribute('v'), + 't' => htmlspecialchars($n->getAttribute('v')), ); } } @@ -1103,7 +1103,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = array(); for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); $allsy[] = array( 'id' => $n->getAttribute('id'), 't' => $t, @@ -1190,7 +1190,7 @@ class ThesaurusXmlHttpController extends Controller } else { for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); $tid = $n->getAttribute('id'); $zhtml .= '

'; @@ -1213,7 +1213,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = ''; for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = $n->getAttribute('v'); + $t = htmlspecialchars($n->getAttribute('v')); if ($n->getAttribute('bold')) { $allsy .= ( $allsy ? ' ; ' : '') . 'getAttribute('id') . '\'>' . $t . ''; } else { @@ -1613,7 +1613,7 @@ class ThesaurusXmlHttpController extends Controller if ($n2->nodeName == 'sy') { $lng = $n2->getAttribute('lng'); - $t = $n2->getAttribute('v'); + $t = htmlspecialchars($n2->getAttribute('v')); $key = $n2->getAttribute('w'); // key of the current sy if ($k = $n2->getAttribute('k')) { From 60c126c7b98f7abaa58d430cf493523242eb6ca4 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Fri, 29 Mar 2019 17:20:04 +0400 Subject: [PATCH 05/21] escape when rendered --- .../Controller/Prod/PushController.php | 2 +- .../Thesaurus/ThesaurusController.php | 20 +++++++--- .../Thesaurus/ThesaurusXmlHttpController.php | 24 ++++++------ templates/web/prod/templates/push.html.twig | 39 ++++++++++++++----- templates/web/thesaurus/new-term.html.twig | 4 +- templates/web/thesaurus/thesaurus.html.twig | 10 ++++- 6 files changed, 68 insertions(+), 31 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php index 35b3a3bc42..569537fed3 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php @@ -597,7 +597,7 @@ class PushController extends Controller private function formatUser(User $user) { - $subtitle = array_filter([htmlspecialchars($user->getJob()), htmlspecialchars($user->getCompany())]); + $subtitle = array_filter([$user->getJob(), $user->getCompany()]); return [ 'type' => 'USER', diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php index 0e9704b576..1bd06d83b2 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php @@ -806,7 +806,7 @@ class ThesaurusController extends Controller if (!$t) { $t = "..."; } - $fullBranch = " / " . $t . $fullBranch; + $fullBranch = " / " . htmlspecialchars($t) . $fullBranch; } } $nodes = $xpathstruct->query("/record/description/*"); @@ -1159,7 +1159,7 @@ class ThesaurusController extends Controller '1', null ); - $fullpath = $dom->getElementsByTagName("fullpath_html")->item(0)->firstChild->nodeValue; + $fullpathHtml = $dom->getElementsByTagName("fullpath_html")->item(0)->firstChild->nodeValue; $hits = $dom->getElementsByTagName("allhits")->item(0)->firstChild->nodeValue; $languages = $synonyms = []; @@ -1180,6 +1180,16 @@ class ThesaurusController extends Controller $languages[$lng_code[0]] = $language; } + // Escape path between span tag in fullpath_html + preg_match_all("'(<[^><]*>)(.*?)(<[^><]*>)'", $fullpathHtml, $matches, PREG_SET_ORDER); + + $safeFullpath = ''; + foreach($matches as $match) { + unset($match[0]); // full match result not used + $match[2] = htmlspecialchars($match[2]); + $safeFullpath .= implode('', $match); + } + return $this->render('thesaurus/properties.html.twig', [ 'typ' => $request->get('typ'), 'bid' => $request->get('bid'), @@ -1187,7 +1197,7 @@ class ThesaurusController extends Controller 'id' => $request->get('id'), 'dlg' => $request->get('dlg'), 'languages' => $languages, - 'fullpath' => $fullpath, + 'fullpath' => $safeFullpath, 'hits' => $hits, 'synonyms' => $synonyms, ]); @@ -2128,7 +2138,7 @@ class ThesaurusController extends Controller $sy = $sy_list->appendChild($ret->createElement("sy")); $sy->setAttribute("id", $n->getAttribute("id")); - $sy->setAttribute("v", htmlspecialchars($t = $n->getAttribute("v"))); + $sy->setAttribute("v", $t = $n->getAttribute("v")); $sy->setAttribute("w", $n->getAttribute("w")); $sy->setAttribute("hits", ''); $sy->setAttribute("lng", $lng = $n->getAttribute("lng")); @@ -2177,7 +2187,7 @@ class ThesaurusController extends Controller $firstsy = $goodsy = null; for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { - $t = htmlspecialchars($n2->getAttribute("v")); + $t = $n2->getAttribute("v"); if (! $firstsy) { $firstsy = $t; } diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php index e7b844297f..ca820a6be5 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php @@ -252,7 +252,7 @@ class ThesaurusXmlHttpController extends Controller /** @var DOMElement $n2 */ for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { - $sy = htmlspecialchars($n2->getAttribute("v")); + $sy = $n2->getAttribute("v"); if (!$firstsy) { $firstsy = $sy; if ($request->get("debug")) { @@ -441,7 +441,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { $lng = $n2->getAttribute("lng"); - $t = htmlspecialchars($n2->getAttribute("v")); + $t = $n2->getAttribute("v"); $ksy = $n2->getAttribute("w"); if ($k = $n2->getAttribute("k")) { $ksy .= " ($k)"; @@ -586,7 +586,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == "sy") { $lng = $n2->getAttribute("lng"); - $t = htmlspecialchars($n2->getAttribute("v")); + $t = $n2->getAttribute("v"); $ksy = $n2->getAttribute("w"); if ($k = $n2->getAttribute("k")) { $ksy .= " ($k)"; @@ -843,7 +843,7 @@ class ThesaurusXmlHttpController extends Controller for ($n2 = $n->firstChild; $n2; $n2 = $n2->nextSibling) { if ($n2->nodeName == 'sy') { $lng = $n2->getAttribute('lng'); - $t = htmlspecialchars($n2->getAttribute('v')); + $t = $n2->getAttribute('v'); $key = $n2->getAttribute('w'); // key of the current sy if ($k = $n2->getAttribute('k')) { $key .= ' (' . $k . ')'; @@ -920,7 +920,7 @@ class ThesaurusXmlHttpController extends Controller $bid = $request->get('bid'); for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); $tid = $n->getAttribute('id'); $html .= '

'; @@ -967,7 +967,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = ''; for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); if ($n->getAttribute('bold')) { $allsy .= ( $allsy ? ' ; ' : '') . 'getAttribute('id') . '\'>' . $t . ''; } else { @@ -1078,12 +1078,12 @@ class ThesaurusXmlHttpController extends Controller $ret['result'] = array(); for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); $tid = $n->getAttribute('id'); $ret['result'][] = array( 'id' => $n->getAttribute('id'), - 't' => htmlspecialchars($n->getAttribute('v')), + 't' => $n->getAttribute('v'), ); } } @@ -1103,7 +1103,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = array(); for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); $allsy[] = array( 'id' => $n->getAttribute('id'), 't' => $t, @@ -1190,7 +1190,7 @@ class ThesaurusXmlHttpController extends Controller } else { for ($i = 0; $i < $nodes->length; $i++) { $n = $nodes->item($i); - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); $tid = $n->getAttribute('id'); $zhtml .= '

'; @@ -1213,7 +1213,7 @@ class ThesaurusXmlHttpController extends Controller $allsy = ''; for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { if ($n->nodeName == 'sy') { - $t = htmlspecialchars($n->getAttribute('v')); + $t = $n->getAttribute('v'); if ($n->getAttribute('bold')) { $allsy .= ( $allsy ? ' ; ' : '') . 'getAttribute('id') . '\'>' . $t . ''; } else { @@ -1611,7 +1611,7 @@ class ThesaurusXmlHttpController extends Controller if ($n2->nodeName == 'sy') { $lng = $n2->getAttribute('lng'); - $t = htmlspecialchars($n2->getAttribute('v')); + $t = $n2->getAttribute('v'); $key = $n2->getAttribute('w'); // key of the current sy if ($k = $n2->getAttribute('k')) { diff --git a/templates/web/prod/templates/push.html.twig b/templates/web/prod/templates/push.html.twig index fe47af8ed9..a769c2d3be 100644 --- a/templates/web/prod/templates/push.html.twig +++ b/templates/web/prod/templates/push.html.twig @@ -12,17 +12,17 @@
- <%= item.display_name %> + <%= htmlEncode(item.display_name) %>
- +
- <%= item.subtitle || '' %> + <%= htmlEncode(item.subtitle) || '' %>
@@ -47,7 +47,7 @@ @@ -81,12 +81,12 @@
- <%= item.name %> + <%= htmlEncode(item.name) %>
@@ -201,12 +201,12 @@
- <%= user.display_name %> + <%= htmlEncode(user.display_name) %>
- <%= user.subtitle || '' %> + <%= htmlEncode(user.subtitle) || '' %>
@@ -242,12 +242,12 @@
- <%= user.display_name %> + <%= htmlEncode(user.display_name) %>
- <%= user.subtitle || '' %> + <%= htmlEncode(user.subtitle) || '' %>
@@ -267,3 +267,22 @@ + diff --git a/templates/web/thesaurus/new-term.html.twig b/templates/web/thesaurus/new-term.html.twig index 8c7c825392..5c9dc238ca 100644 --- a/templates/web/thesaurus/new-term.html.twig +++ b/templates/web/thesaurus/new-term.html.twig @@ -16,11 +16,11 @@ {% if context %} {% set zterm %} - {% trans with {'%term%' : term, '%context%' : context} %}thesaurus:: le terme %term% avec contexte %context%{% endtrans %} + {% trans with {'%term%' : term | e, '%context%' : context | e} %}thesaurus:: le terme %term% avec contexte %context%{% endtrans %} {% endset %} {% else %} {% set zterm %} - {% trans with {'%term%' : term} %}thesaurus:: le terme %term% sans contexte{% endtrans %} + {% trans with {'%term%' : term | e} %}thesaurus:: le terme %term% sans contexte{% endtrans %} {% endset %} {% endif %} diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig index 692d5ad355..87b234b371 100644 --- a/templates/web/thesaurus/thesaurus.html.twig +++ b/templates/web/thesaurus/thesaurus.html.twig @@ -338,6 +338,8 @@ for(var sy=syl.item(0).firstChild; sy; sy=sy.nextSibling ) { var lng = sy.getAttribute("lng"); + var v = escapeHtmlDataFromXML(sy.getAttribute("v")); + html += ""; if(lng) if(tFlags[lng]) @@ -347,7 +349,7 @@ else html += ""; - html += ""; + html += ""; var hits = 0+sy.getAttribute("hits"); if(hits == 1) @@ -361,6 +363,12 @@ return(html); } + // Let the browser to do it + function escapeHtmlDataFromXML(data){ + var d = document.createElement('div'); + d.appendChild(document.createTextNode(data)); + return d.innerHTML; + } // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // From c89757c4d720da8cb6a3f7717d92bfe9ce556ba0 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Fri, 5 Apr 2019 15:57:49 +0400 Subject: [PATCH 06/21] escape in controller --- .../Controller/Prod/RecordController.php | 33 ++++++++++++------- lib/classes/record/adapter.php | 2 +- lib/classes/record/preview.php | 4 +-- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index ef67a81ae0..0a948d6d1d 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -90,35 +90,44 @@ class RecordController extends Controller } $recordCaptions["technicalInfo"] = $record->getPositionFromTechnicalInfos(); + // escape record title before rendering + $recordTitle = explode("", $record->get_title()); + if (count($recordTitle) >1) { + $recordTitle[1] = htmlspecialchars($recordTitle[1]); + $recordTitle = implode("", $recordTitle); + } else { + $recordTitle = htmlspecialchars($record->get_title()); + } + return $this->app->json([ - "desc" => $this->render('prod/preview/caption.html.twig', [ + "desc" => $this->render('prod/preview/caption.html.twig', [ 'record' => $record, 'highlight' => $query, 'searchEngine' => $searchEngine, 'searchOptions' => $options, ]), - "recordCaptions"=> $recordCaptions, - "html_preview" => $this->render('common/preview.html.twig', [ + "recordCaptions" => $recordCaptions, + "html_preview" => $this->render('common/preview.html.twig', [ 'record' => $record ]), - "others" => $this->render('prod/preview/appears_in.html.twig', [ + "others" => $this->render('prod/preview/appears_in.html.twig', [ 'parents' => $record->get_grouping_parents(), 'baskets' => $record->get_container_baskets($this->getEntityManager(), $this->getAuthenticatedUser()), ]), - "current" => $train, - "record" => $currentRecord, - "history" => $this->render('prod/preview/short_history.html.twig', [ + "current" => $train, + "record" => $currentRecord, + "history" => $this->render('prod/preview/short_history.html.twig', [ 'record' => $record, ]), - "popularity" => $this->render('prod/preview/popularity.html.twig', [ + "popularity" => $this->render('prod/preview/popularity.html.twig', [ 'record' => $record, ]), - "tools" => $this->render('prod/preview/tools.html.twig', [ + "tools" => $this->render('prod/preview/tools.html.twig', [ 'record' => $record, ]), - "pos" => $record->getNumber(), - "title" => $record->get_title(), - "databox_name" => $record->getDatabox()->get_dbname(), + "pos" => $record->getNumber(), + "title" => $recordTitle, + "databox_name" => $record->getDatabox()->get_dbname(), "collection_name" => $record->getCollection()->get_name(), "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app), ]); diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 2a4a3a1c7d..c4045d9fc5 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -941,7 +941,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface $this->set_data_to_cache(self::CACHE_TITLE, $title); } - return htmlspecialchars($title); + return $title; } /** diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 1c88f6e94e..dd0ae0fe43 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -149,7 +149,7 @@ class record_preview extends record_adapter $this->original_item = $element; $sbas_id = $element->getSbasId(); $record_id = $element->getRecordId(); - $this->name = htmlspecialchars($Basket->getName()); + $this->name = $Basket->getName(); $number = $element->getOrd(); $first = false; } @@ -169,7 +169,7 @@ class record_preview extends record_adapter if ($element->getOrd() == $pos || $first) { $sbas_id = $element->getSbasId(); $record_id = $element->getRecordId(); - $this->name = htmlspecialchars($entry->getTitle()); + $this->name = $entry->getTitle(); $this->original_item = $element; $number = $element->getOrd(); $first = false; From 5cdf473c7f821e448b3c7793c5283566c7583e20 Mon Sep 17 00:00:00 2001 From: aynsix <35221835+aynsix@users.noreply.github.com> Date: Mon, 8 Apr 2019 16:25:17 +0400 Subject: [PATCH 07/21] PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas (#2918) * allow user to delete account * generate translation and add checkbox in the windows confirmation * change text an configuration key * update delete account fonctionality * rename variable * write in explicite condition * merge yarn.lock * regenerate translation --- config/configuration.sample.yml | 1 + .../CollectionRepositoryRegistry.php | 9 + .../Controller/Root/AccountController.php | 187 +++++++++++++- .../ControllerProvider/Root/Account.php | 8 + .../Provider/RepositoriesServiceProvider.php | 3 + .../Model/Entities/ValidationSession.php | 2 +- .../Manipulator/ApiApplicationManipulator.php | 8 + .../Model/Manipulator/BasketManipulator.php | 8 + .../Model/Manipulator/TokenManipulator.php | 11 + .../ValidationSessionRepository.php | 24 ++ .../Notification/Mail/AbstractMail.php | 11 + .../Mail/MailRequestAccountDelete.php | 105 ++++++++ .../Mail/MailSuccessAccountDelete.php | 45 ++++ lib/conf.d/configuration.yml | 1 + resources/locales/messages.de.xlf | 237 ++++++++++++------ resources/locales/messages.en.xlf | 237 ++++++++++++------ resources/locales/messages.fr.xlf | 237 ++++++++++++------ resources/locales/messages.nl.xlf | 237 ++++++++++++------ resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- templates/web/account/account.html.twig | 83 +++++- templates/web/email-template.html.twig | 10 +- .../RepositoriesServiceProviderTest.php | 1 + .../Mail/MailRequestAccountDeleteTest.php | 66 +++++ .../Mail/MailSuccessAccountDeleteTest.php | 23 ++ 27 files changed, 1258 insertions(+), 304 deletions(-) create mode 100644 lib/Alchemy/Phrasea/Model/Repositories/ValidationSessionRepository.php create mode 100644 lib/Alchemy/Phrasea/Notification/Mail/MailRequestAccountDelete.php create mode 100644 lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountDelete.php create mode 100644 tests/Alchemy/Tests/Phrasea/Notification/Mail/MailRequestAccountDeleteTest.php create mode 100644 tests/Alchemy/Tests/Phrasea/Notification/Mail/MailSuccessAccountDeleteTest.php diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 982e4aef28..32adca6ce3 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -8,6 +8,7 @@ main: key: '' api_require_ssl: true api_token_header: false + delete-account-require-email-confirmation: true database: host: 127.0.0.1 port: 3306 diff --git a/lib/Alchemy/Phrasea/Collection/CollectionRepositoryRegistry.php b/lib/Alchemy/Phrasea/Collection/CollectionRepositoryRegistry.php index 17f6bb82b4..6d7eaef03c 100644 --- a/lib/Alchemy/Phrasea/Collection/CollectionRepositoryRegistry.php +++ b/lib/Alchemy/Phrasea/Collection/CollectionRepositoryRegistry.php @@ -84,6 +84,15 @@ class CollectionRepositoryRegistry throw new \OutOfBoundsException('No repository available for given base [baseId: ' . $baseId . ' ].'); } + public function getBaseIdMap() + { + if ($this->baseIdMap === null) { + $this->loadBaseIdMap(); + } + + return $this->baseIdMap; + } + public function purgeRegistry() { $this->baseIdMap = null; diff --git a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php index 9d49301c1b..e785c8f0f3 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php +++ b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php @@ -17,20 +17,27 @@ use Alchemy\Phrasea\Application\Helper\EntityManagerAware; use Alchemy\Phrasea\Application\Helper\NotifierAware; use Alchemy\Phrasea\Authentication\Phrasea\PasswordEncoder; use Alchemy\Phrasea\Controller\Controller; -use Alchemy\Phrasea\ControllerProvider\Root\Login; use Alchemy\Phrasea\Core\Configuration\RegistrationManager; use Alchemy\Phrasea\Exception\InvalidArgumentException; use Alchemy\Phrasea\Form\Login\PhraseaRenewPasswordForm; use Alchemy\Phrasea\Model\Entities\ApiApplication; use Alchemy\Phrasea\Model\Entities\FtpCredential; use Alchemy\Phrasea\Model\Entities\Session; +use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\Model\Manipulator\ApiAccountManipulator; +use Alchemy\Phrasea\Model\Manipulator\ApiApplicationManipulator; +use Alchemy\Phrasea\Model\Manipulator\BasketManipulator; use Alchemy\Phrasea\Model\Manipulator\TokenManipulator; use Alchemy\Phrasea\Model\Manipulator\UserManipulator; use Alchemy\Phrasea\Model\Repositories\ApiAccountRepository; use Alchemy\Phrasea\Model\Repositories\ApiApplicationRepository; +use Alchemy\Phrasea\Model\Repositories\BasketRepository; +use Alchemy\Phrasea\Model\Repositories\FeedPublisherRepository; use Alchemy\Phrasea\Model\Repositories\TokenRepository; +use Alchemy\Phrasea\Model\Repositories\ValidationSessionRepository; +use Alchemy\Phrasea\Notification\Mail\MailRequestAccountDelete; use Alchemy\Phrasea\Notification\Mail\MailRequestEmailUpdate; +use Alchemy\Phrasea\Notification\Mail\MailSuccessAccountDelete; use Alchemy\Phrasea\Notification\Receiver; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -299,13 +306,102 @@ class AccountController extends Controller $manager = $this->getEventManager(); $user = $this->getAuthenticatedUser(); + $repo_baskets = $this->getBasketRepository(); + $baskets = $repo_baskets->findActiveValidationAndBasketByUser($user); + + $apiAccounts = $this->getApiAccountRepository()->findByUser($user); + + $ownedFeeds = $this->getFeedPublisherRepository()->findBy(['user' => $user, 'owner' => true]); + + $initiatedValidations = $this->getValidationSessionRepository()->findby(['initiator' => $user, ]); + return $this->render('account/account.html.twig', [ - 'user' => $user, - 'evt_mngr' => $manager, - 'notifications' => $manager->list_notifications_available($user), + 'user' => $user, + 'evt_mngr' => $manager, + 'notifications' => $manager->list_notifications_available($user), + 'baskets' => $baskets, + 'api_accounts' => $apiAccounts, + 'owned_feeds' => $ownedFeeds, + 'initiated_validations' => $initiatedValidations, ]); } + /** + * @param Request $request + * @return RedirectResponse + */ + public function processDeleteAccount(Request $request) + { + $user = $this->getAuthenticatedUser(); + + if($this->app['conf']->get(['main', 'delete-account-require-email-confirmation'])) { + + // send email confirmation + + try { + $receiver = Receiver::fromUser($user); + } catch (InvalidArgumentException $e) { + $this->app->addFlash('error', $this->app->trans('phraseanet::erreur: echec du serveur de mail')); + + return $this->app->redirectPath('account'); + } + + $token = $this->getTokenManipulator()->createAccountDeleteToken($user, $user->getEmail()); + $url = $this->app->url('account_confirm_delete', ['token' => $token->getValue()]); + + + $mail = MailRequestAccountDelete::create($this->app, $receiver); + $mail->setUserOwner($user); + $mail->setButtonUrl($url); + $mail->setExpiration($token->getExpiration()); + + $this->deliver($mail); + + $this->app->addFlash('info', $this->app->trans('phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion')); + + return $this->app->redirectPath('account'); + + } else { + $this->doDeleteAccount($user); + + $response = $this->app->redirectPath('homepage', [ + 'redirect' => $request->query->get("redirect") + ]); + + $response->headers->clearCookie('persistent'); + $response->headers->clearCookie('last_act'); + + return $response; + } + + } + + public function confirmDeleteAccount(Request $request) + { + if (($tokenValue = $request->query->get('token')) !== null ) { + if (null === $token = $this->getTokenRepository()->findValidToken($tokenValue)) { + $this->app->addFlash('error', $this->app->trans('Token not found')); + + return $this->app->redirectPath('account'); + } + + $user = $token->getUser(); + // delete account and datas + $this->doDeleteAccount($user); + + $this->getTokenManipulator()->delete($token); + } + + $response = $this->app->redirectPath('homepage', [ + 'redirect' => $request->query->get("redirect") + ]); + + $response->headers->clearCookie('persistent'); + $response->headers->clearCookie('last_act'); + + return $response; + } + /** * Update account information * @@ -406,6 +502,49 @@ class AccountController extends Controller return $this->app->redirectPath('account'); } + /** + * @param User $user + */ + private function doDeleteAccount(User $user) + { + // basket + $repo_baskets = $this->getBasketRepository(); + $baskets = $repo_baskets->findActiveByUser($user); + $this->getBasketManipulator()->removeBaskets($baskets); + + // application + $applications = $this->getApiApplicationRepository()->findByUser($user); + + $this->getApiApplicationManipulator()->deleteApiApplications($applications); + + + // revoke access and delete phraseanet user account + + $list = array_keys($this->app['repo.collections-registry']->getBaseIdMap()); + + $this->app->getAclForUser($user)->revoke_access_from_bases($list); + + if ($this->app->getAclForUser($user)->is_phantom()) { + // send confirmation email: the account has been deleted + + try { + $receiver = Receiver::fromUser($user); + } catch (InvalidArgumentException $e) { + $this->app->addFlash('error', $this->app->trans('phraseanet::erreur: echec du serveur de mail')); + } + + $mail = MailSuccessAccountDelete::create($this->app, $receiver); + + $this->app['manipulator.user']->delete($user); + + $this->deliver($mail); + } + + $this->getAuthenticator()->closeAccount(); + $this->app->addFlash('info', $this->app->trans('phraseanet::account The account has been deleted')); + + } + /** * @return PasswordEncoder */ @@ -501,4 +640,44 @@ class AccountController extends Controller { return $this->app['events-manager']; } + + /** + * @return BasketManipulator + */ + private function getBasketManipulator() + { + return $this->app['manipulator.basket']; + } + + /** + * @return BasketRepository + */ + private function getBasketRepository() + { + return $this->app['repo.baskets']; + } + + /** + * @return ApiApplicationManipulator + */ + private function getApiApplicationManipulator() + { + return $this->app['manipulator.api-application']; + } + + /** + * @return FeedPublisherRepository + */ + private function getFeedPublisherRepository() + { + return $this->app['repo.feed-publishers']; + } + + /** + * @return ValidationSessionRepository + */ + private function getValidationSessionRepository() + { + return $this->app['repo.validation-session']; + } } diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php b/lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php index 8b911eef91..516c78222b 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php @@ -52,6 +52,14 @@ class Account implements ControllerProviderInterface, ServiceProviderInterface $controllers->get('/', 'account.controller:displayAccount') ->bind('account'); + // allow to delete phraseanet account + $controllers->get('/delete/process', 'account.controller:processDeleteAccount') + ->bind('account_process_delete'); + + $controllers->get('/delete/confirm', 'account.controller:confirmDeleteAccount') + ->bind('account_confirm_delete'); + + // Updates current logged in user account $controllers->post('/', 'account.controller:updateAccount') ->bind('submit_update_account'); diff --git a/lib/Alchemy/Phrasea/Core/Provider/RepositoriesServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RepositoriesServiceProvider.php index 80f9d2286c..b4d4e42fc7 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/RepositoriesServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/RepositoriesServiceProvider.php @@ -66,6 +66,9 @@ class RepositoriesServiceProvider implements ServiceProviderInterface $app['repo.validation-participants'] = $app->share(function (PhraseaApplication $app) { return $app['orm.em']->getRepository('Phraseanet:ValidationParticipant'); }); + $app['repo.validation-session'] = $app->share(function (PhraseaApplication $app) { + return $app['orm.em']->getRepository('Phraseanet:ValidationSession'); + }); $app['repo.story-wz'] = $app->share(function (PhraseaApplication $app) { return $app['orm.em']->getRepository('Phraseanet:StoryWZ'); }); diff --git a/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php b/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php index 02a108c625..dccc80281a 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php +++ b/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php @@ -18,7 +18,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * @ORM\Table(name="ValidationSessions") - * @ORM\Entity + * @ORM\Entity(repositoryClass="Alchemy\Phrasea\Model\Repositories\ValidationSessionRepository") */ class ValidationSession { diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/ApiApplicationManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/ApiApplicationManipulator.php index 7d45988f20..b1f944f13e 100644 --- a/lib/Alchemy/Phrasea/Model/Manipulator/ApiApplicationManipulator.php +++ b/lib/Alchemy/Phrasea/Model/Manipulator/ApiApplicationManipulator.php @@ -57,6 +57,14 @@ class ApiApplicationManipulator implements ManipulatorInterface $this->om->flush(); } + public function deleteApiApplications(array $applications) + { + foreach ($applications as $application) { + $this->om->remove($application); + } + $this->om->flush(); + } + public function update(ApiApplication $application) { $this->om->persist($application); diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/BasketManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/BasketManipulator.php index 070791bf0b..640f2b7f9b 100644 --- a/lib/Alchemy/Phrasea/Model/Manipulator/BasketManipulator.php +++ b/lib/Alchemy/Phrasea/Model/Manipulator/BasketManipulator.php @@ -118,4 +118,12 @@ class BasketManipulator $this->manager->remove($basket); $this->manager->flush(); } + + public function removeBaskets(array $baskets) + { + foreach ($baskets as $basket) { + $this->manager->remove($basket); + } + $this->manager->flush(); + } } diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php index 1c14c851e8..2a43363693 100644 --- a/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php +++ b/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php @@ -26,6 +26,7 @@ class TokenManipulator implements ManipulatorInterface const TYPE_FEED_ENTRY = 'FEED_ENTRY'; const TYPE_PASSWORD = 'password'; const TYPE_ACCOUNT_UNLOCK = 'account-unlock'; + const TYPE_ACCOUNT_DELETE = 'account-delete'; const TYPE_DOWNLOAD = 'download'; const TYPE_MAIL_DOWNLOAD = 'mail-download'; const TYPE_EMAIL = 'email'; @@ -167,6 +168,16 @@ class TokenManipulator implements ManipulatorInterface return $this->create($user, self::TYPE_ACCOUNT_UNLOCK, new \DateTime('+3 days')); } + /** + * @param User $user + * + * @return Token + */ + public function createAccountDeleteToken(User $user, $email) + { + return $this->create($user, self::TYPE_ACCOUNT_DELETE, new \DateTime('+1 hour'), $email); + } + /** * @param User $user * diff --git a/lib/Alchemy/Phrasea/Model/Repositories/ValidationSessionRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/ValidationSessionRepository.php new file mode 100644 index 0000000000..1bfd411c3f --- /dev/null +++ b/lib/Alchemy/Phrasea/Model/Repositories/ValidationSessionRepository.php @@ -0,0 +1,24 @@ + $this->getExpiration(), 'buttonUrl' => $this->getButtonURL(), 'buttonText' => $this->getButtonText(), + 'mailSkin' => $this->getMailSkin(), ]); } @@ -166,6 +169,14 @@ abstract class AbstractMail implements MailInterface $this->url = $url; } + /** + * @return string + */ + public function getMailSkin() + { + return self::MAIL_SKIN; + } + /** * {@inheritdoc} */ diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestAccountDelete.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestAccountDelete.php new file mode 100644 index 0000000000..56998f0a0f --- /dev/null +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestAccountDelete.php @@ -0,0 +1,105 @@ +user = $userOwner; + } + + /** + * {@inheritdoc} + */ + public function getSubject() + { + return $this->app->trans('Email:deletion:request:subject Delete account confirmation'); + } + + /** + * {@inheritdoc} + */ + public function getMessage() + { + if (!$this->user) { + throw new LogicException('You must set a user before calling getMessage'); + } + + return $this->app->trans("Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour.", [ + '%civility%' => $this->getOwnerCivility(), + '%firstName%'=> $this->user->getFirstName(), + '%lastName%' => $this->user->getLastName(), + '%urlInstance%' => ''.$this->getPhraseanetURL().'', + '%resetPassword%' => ''.$this->app->url('reset_password').'', + ]); + } + + /** + * {@inheritdoc} + */ + public function getButtonText() + { + return $this->app->trans('Email:deletion:request:textButton Delete my account'); + } + + /** + * {@inheritdoc} + */ + public function getButtonURL() + { + return $this->url; + } + + /** + * {@inheritdoc} + */ + public function getMailSkin() + { + return self::MAIL_SKIN; + } + + private function getOwnerCivility() + { + if (!$this->user) { + throw new LogicException('You must set a user before calling getMessage'); + } + + $civilities = [ + User::GENDER_MISS => 'Miss', + User::GENDER_MRS => 'Mrs', + User::GENDER_MR => 'Mr', + ]; + + if (array_key_exists($this->user->getGender(), $civilities)) { + return $civilities[$this->user->getGender()]; + } else { + return ''; + } + } +} diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountDelete.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountDelete.php new file mode 100644 index 0000000000..462feda255 --- /dev/null +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountDelete.php @@ -0,0 +1,45 @@ +app->trans('Delete account successfull'); + } + + /** + * {@inheritdoc} + */ + public function getMessage() + { + return $this->app->trans('Your phraseanet account on %urlInstance% has been deleted!', ['%urlInstance%' => ''.$this->getPhraseanetURL().'']); + } + + /** + * {@inheritdoc} + */ + public function getButtonText() + { + } + + /** + * {@inheritdoc} + */ + public function getButtonURL() + { + } +} diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 4c49e6ded6..f351d620cb 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -6,6 +6,7 @@ main: maintenance: false key: '' api_require_ssl: true + delete-account-require-email-confirmation: true database: host: 'sql-host' port: 3306 diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index cc637f7e5f..03caf96a6c 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -499,7 +499,7 @@ A task has been creted, please run it to complete empty collection Eine Aufgabe wurde erstellt. Bitte führen Sie diese aus um die Leerung der Kollektion fertigstellen zu können - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. @@ -954,17 +954,17 @@ Controller/Prod/LazaretController.php Controller/Prod/ToolsController.php Controller/Prod/BasketController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxesController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -1024,7 +1024,7 @@ Controller/Api/V1Controller.php Controller/Prod/BasketController.php Controller/Admin/SearchEngineController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php web/admin/statusbit.html.twig @@ -1407,7 +1407,7 @@ Bad request format, only JSON is allowed Bad Request Format, nur JSON wird erlaubt - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php Controller/Admin/DataboxController.php @@ -1823,7 +1823,7 @@ Collection empty successful Die Leerung der Kollektion wurde erfolgreich abgeschlossen - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Collection order @@ -1995,7 +1995,7 @@ Could not perform request, please contact an administrator. Antrag konnte nicht durchgeführt werden. Bitte wenden Sie sich an Ihren Systemadministrator - Controller/Root/AccountController.php + Controller/Root/AccountController.php Could not retrieve the file ID, please retry or contact an admin if problem persist @@ -2365,6 +2365,11 @@ prod/upload/lazaret.html.twig admin/task-manager/templates.html.twig + + Delete account successfull + Delete account successfull + Notification/Mail/MailSuccessAccountDelete.php + Delete all users rights Alle Nutzerrechte löschen @@ -2756,7 +2761,7 @@ Email '%email%' for login '%login%' already exists in database Email '%email%' für Login '%login%' existiert schon in der Databank - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -2789,6 +2794,27 @@ E-Mail Test Ergebnis: %email_status% web/admin/dashboard.html.twig + + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:subject Delete account confirmation + Email:deletion:request:subject Delete account confirmation + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:textButton Delete my account + Email:deletion:request:textButton Delete my account + Notification/Mail/MailRequestAccountDelete.php + Emails E-Mail Adressen @@ -2823,8 +2849,8 @@ Empty the collection before removing Kollektion leeren bevor Entfernung - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3081,7 +3107,7 @@ Error while sending the file Fehler beim Datei Senden - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3748,7 +3774,7 @@ Invalid file format Ungültiges Datei Format - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3772,7 +3798,7 @@ Invalid labels parameter ungültige Labels Parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3783,7 +3809,7 @@ Invalid password provided ungültiges Passwort geliefert - Controller/Root/AccountController.php + Controller/Root/AccountController.php Invalid target collection @@ -3967,7 +3993,7 @@ Le contenu de cet email est confidentiel, ne le divulguez pas. Der Inhalt von dieser Email ist geheim, bitte nicht enthüllen - templates/web/email-template.html.twig + templates/web/email-template.html.twig Le nom de base de donnee est incorrect @@ -4142,17 +4168,17 @@ Login %login% already exists in database Benutzername %login% existiert schon im Datenbank - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Benutzername %login% ist schon in Datei in Linie %line% definiert - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Benutzername Zeile %line% ist leer - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4174,7 +4200,7 @@ Mail line %line% is empty Email Zeile %line% ist leer - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4260,7 +4286,7 @@ Message automatique de Phraseanet Phraseanet Automatische Meldung - templates/web/email-template.html.twig + templates/web/email-template.html.twig Mettre a jour @@ -4290,7 +4316,7 @@ Missing labels parameter Labels-Parameter fehlt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -4301,7 +4327,7 @@ Missing name parameter Name-Parameter fehlt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4390,6 +4416,11 @@ mehrwertiges admin/fields/templates.html.twig + + My application + My application + web/account/account.html.twig + My baskets Meine Sammelkörbe @@ -4469,6 +4500,7 @@ No Nein + web/account/account.html.twig web/developers/applications.html.twig @@ -4844,6 +4876,7 @@ Paniers Sammelkörbe + web/account/account.html.twig web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -4872,7 +4905,7 @@ Password is empty at line %line% Passwort ist leer in Zeile %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -5080,7 +5113,7 @@ Pour gérer l'envoi d'email automatique, connectez-vous à %link% Bitte besuchen Sie %link%, um automatisierte Meldungen zu verwalten - templates/web/email-template.html.twig + templates/web/email-template.html.twig Preference saved ! @@ -6360,22 +6393,22 @@ Successful removal erfolgreiches Löschen - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Erfolgreiches Update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -6605,7 +6638,7 @@ The file is too big Datei ist zu gross - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6621,7 +6654,7 @@ The publication has been stopped Veröffentlichung wurde gestoppt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6746,7 +6779,7 @@ This link is valid until URL ist gültig bis - templates/web/email-template.html.twig + templates/web/email-template.html.twig This option disables the selecting of the databases on which a user can register himself, and registration is made on all granted databases. @@ -6816,6 +6849,11 @@ Token web/developers/application.html.twig + + Token not found + Token not found + Controller/Root/AccountController.php + Tool box Toolbox @@ -6946,12 +6984,12 @@ Unable to create template, the name is already used. Unmöglich, eine Vorlage zu erstellen; die Name wird schon benutzt. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unmöglich, den Benutzer zu erstellen. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -7608,6 +7646,7 @@ Yes Ja + web/account/account.html.twig user/import/view.html.twig web/developers/applications.html.twig @@ -7896,10 +7935,15 @@ Ihre Media und Unterauflösungen (Voransichten, Miniaturansichten..) werden in diese Verzeichnisse gespeichert. web/setup/step2.html.twig + + Your phraseanet account on %urlInstance% has been deleted! + Your phraseanet account on %urlInstance% has been deleted! + Notification/Mail/MailSuccessAccountDelete.php + Your registration requests have been taken into account. Ihre Registrierungsanfragen wurden berücksichtigt - Controller/Root/AccountController.php + Controller/Root/AccountController.php a propos @@ -8399,7 +8443,7 @@ admin::compte-utilisateur activite Tätigkeit Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8408,7 +8452,7 @@ admin::compte-utilisateur adresse Adresse Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8423,7 +8467,7 @@ admin::compte-utilisateur code postal PLZ Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8447,7 +8491,7 @@ admin::compte-utilisateur email E-Mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8459,7 +8503,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8496,7 +8540,7 @@ Name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8511,14 +8555,14 @@ admin::compte-utilisateur pays Land - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/users.html.twig admin::compte-utilisateur poste Beruf Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8529,7 +8573,7 @@ Vorname Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8546,7 +8590,7 @@ admin::compte-utilisateur societe Firma Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8562,7 +8606,7 @@ admin::compte-utilisateur telephone Telefon - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8572,13 +8616,13 @@ admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer Wir haben Ihnen eine Email Bestätigung geschickt. Bitte folgen Sie den Anweisungen um fortzusetzen. - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur ville Ort Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8586,7 +8630,7 @@ admin::compte-utilisateur: L'email a correctement ete mis a jour Die E-Mail wurde aktualisiert - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ? @@ -8606,7 +8650,7 @@ admin::compte-utilisateur: erreur lors de la mise a jour Fehler beim Updaten - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur::securite caracteres majuscules @@ -8642,7 +8686,7 @@ admin::compte-utilisateur:ftp: Le mot de passe est errone falsches Passwort - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur:ftp: Nombre d'essais max @@ -9793,7 +9837,7 @@ forms::l'email semble invalide E-Mail scheint ungültig - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::la valeur donnee est trop courte @@ -9824,7 +9868,7 @@ forms::les emails ne correspondent pas Die E-Mail sind nicht gleich - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::les mots de passe ne correspondent pas @@ -10040,12 +10084,12 @@ login::notification: Changements enregistres Veränderungen wurden bestätigt - Controller/Root/AccountController.php + Controller/Root/AccountController.php login::notification: Mise a jour du mot de passe avec succes erfolgreiche Passwort Aktualisierung - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Root/LoginController.php @@ -10084,12 +10128,12 @@ login::register:email: Vous avez ete accepte sur les collections suivantes : Ihr Zugriff wurde für die folgende Kollektionen genehmigt : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Ihr Zugriff wurde für die folgende Kollektionen abgelehnt : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -10724,6 +10768,51 @@ Diese Meldung nicht mehr anzeigen Controller/Prod/LanguageController.php + + phraseanet::account The account has been deleted + phraseanet::account The account has been deleted + Controller/Root/AccountController.php + + + > ]]> + > ]]> + web/account/account.html.twig + + + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + Controller/Root/AccountController.php + + + phraseanet::account: Are you sure you want to delete your account? + phraseanet::account: Are you sure you want to delete your account? + web/account/account.html.twig + + + phraseanet::account: Delete my account + phraseanet::account: Delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account + phraseanet::account: I am agree to delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account, need confirmation on mail + phraseanet::account: I am agree to delete my account, need confirmation on mail + web/account/account.html.twig + + + phraseanet::account: List of data to be deleted + phraseanet::account: List of data to be deleted + web/account/account.html.twig + + + phraseanet::account: My phraseanet account + phraseanet::account: My phraseanet account + web/account/account.html.twig + phraseanet::chargement Bitte warten... @@ -10754,7 +10843,9 @@ phraseanet::erreur: echec du serveur de mail Mailserver-Ausfall - Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php phraseanet::jours:: dimanche diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 52766d80fd..c573b804d2 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -499,7 +499,7 @@ A task has been creted, please run it to complete empty collection A task has been created, please run it to empty collection - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. @@ -954,17 +954,17 @@ Controller/Prod/LazaretController.php Controller/Prod/ToolsController.php Controller/Prod/BasketController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxesController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -1024,7 +1024,7 @@ Controller/Api/V1Controller.php Controller/Prod/BasketController.php Controller/Admin/SearchEngineController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php web/admin/statusbit.html.twig @@ -1407,7 +1407,7 @@ Bad request format, only JSON is allowed Bad request format. Only JSON is allowed. - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php Controller/Admin/DataboxController.php @@ -1823,7 +1823,7 @@ Collection empty successful Collection successfully emptied - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Collection order @@ -1995,7 +1995,7 @@ Could not perform request, please contact an administrator. Request can't be performed. Please contact an administrator. - Controller/Root/AccountController.php + Controller/Root/AccountController.php Could not retrieve the file ID, please retry or contact an admin if problem persist @@ -2365,6 +2365,11 @@ prod/upload/lazaret.html.twig admin/task-manager/templates.html.twig + + Delete account successfull + Delete account successfull + Notification/Mail/MailSuccessAccountDelete.php + Delete all users rights Delete all users rights @@ -2756,7 +2761,7 @@ Email '%email%' for login '%login%' already exists in database E-mail '%email%' for login '%login%' already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -2789,6 +2794,27 @@ E-mail test result: %email_status% web/admin/dashboard.html.twig + + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:subject Delete account confirmation + Email:deletion:request:subject Delete account confirmation + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:textButton Delete my account + Email:deletion:request:textButton Delete my account + Notification/Mail/MailRequestAccountDelete.php + Emails E-mail configuration @@ -2823,8 +2849,8 @@ Empty the collection before removing Empty the collection before deleting. - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3081,7 +3107,7 @@ Error while sending the file Error while sending the file - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3748,7 +3774,7 @@ Invalid file format Invalid file format - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3772,7 +3798,7 @@ Invalid labels parameter Invalid label parameters - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3783,7 +3809,7 @@ Invalid password provided Invalid password provided - Controller/Root/AccountController.php + Controller/Root/AccountController.php Invalid target collection @@ -3967,7 +3993,7 @@ Le contenu de cet email est confidentiel, ne le divulguez pas. The content of this e-mail is confidential. Please do not disclose it. - templates/web/email-template.html.twig + templates/web/email-template.html.twig Le nom de base de donnee est incorrect @@ -4142,17 +4168,17 @@ Login %login% already exists in database Login %login% already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Login %login% already exists in the file line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Login line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4174,7 +4200,7 @@ Mail line %line% is empty E-mail line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4260,7 +4286,7 @@ Message automatique de Phraseanet Automatic message from Phraseanet - templates/web/email-template.html.twig + templates/web/email-template.html.twig Mettre a jour @@ -4290,7 +4316,7 @@ Missing labels parameter Labels missing parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -4301,7 +4327,7 @@ Missing name parameter Missing name parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4390,6 +4416,11 @@ Multivalued admin/fields/templates.html.twig + + My application + My application + web/account/account.html.twig + My baskets My baskets @@ -4469,6 +4500,7 @@ No No + web/account/account.html.twig web/developers/applications.html.twig @@ -4844,6 +4876,7 @@ Paniers Baskets + web/account/account.html.twig web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -4872,7 +4905,7 @@ Password is empty at line %line% Password is empty in line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -5080,7 +5113,7 @@ Pour gérer l'envoi d'email automatique, connectez-vous à %link% To manage automatic e-mail notifications, please connect to %link%. - templates/web/email-template.html.twig + templates/web/email-template.html.twig Preference saved ! @@ -6360,22 +6393,22 @@ Successful removal Successful removal. - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Successful update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -6605,7 +6638,7 @@ The file is too big The file is too large. - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6621,7 +6654,7 @@ The publication has been stopped The publication has been stopped. - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6746,7 +6779,7 @@ This link is valid until This link is valid until - templates/web/email-template.html.twig + templates/web/email-template.html.twig This option disables the selecting of the databases on which a user can register himself, and registration is made on all granted databases. @@ -6816,6 +6849,11 @@ Token web/developers/application.html.twig + + Token not found + Token not found + Controller/Root/AccountController.php + Tool box Media Tool box @@ -6946,12 +6984,12 @@ Unable to create template, the name is already used. Unable to create template, the name is already used. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unable to create the user. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -7608,6 +7646,7 @@ Yes Yes + web/account/account.html.twig user/import/view.html.twig web/developers/applications.html.twig @@ -7896,10 +7935,15 @@ Media and their subviews (such as previews, thumbnails...) will be stored in the following directories: web/setup/step2.html.twig + + Your phraseanet account on %urlInstance% has been deleted! + Your phraseanet account on %urlInstance% has been deleted! + Notification/Mail/MailSuccessAccountDelete.php + Your registration requests have been taken into account. Your registration request have been taken into account. - Controller/Root/AccountController.php + Controller/Root/AccountController.php a propos @@ -8399,7 +8443,7 @@ admin::compte-utilisateur activite Activity Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8408,7 +8452,7 @@ admin::compte-utilisateur adresse Address Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8423,7 +8467,7 @@ admin::compte-utilisateur code postal Zip code Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8447,7 +8491,7 @@ admin::compte-utilisateur email E-mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8459,7 +8503,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8496,7 +8540,7 @@ Last name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8511,14 +8555,14 @@ admin::compte-utilisateur pays Country - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/users.html.twig admin::compte-utilisateur poste Job Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8529,7 +8573,7 @@ First name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8546,7 +8590,7 @@ admin::compte-utilisateur societe Company Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8562,7 +8606,7 @@ admin::compte-utilisateur telephone Phone - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8572,13 +8616,13 @@ admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer A confirmation e-mail has been sent. Please follow the instructions contained to continue. - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur ville City Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8586,7 +8630,7 @@ admin::compte-utilisateur: L'email a correctement ete mis a jour E-mail address successfully updated. - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ? @@ -8606,7 +8650,7 @@ admin::compte-utilisateur: erreur lors de la mise a jour Error while updating - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur::securite caracteres majuscules @@ -8642,7 +8686,7 @@ admin::compte-utilisateur:ftp: Le mot de passe est errone Wrong password - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur:ftp: Nombre d'essais max @@ -9793,7 +9837,7 @@ forms::l'email semble invalide E-mail address seems invalid. - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::la valeur donnee est trop courte @@ -9824,7 +9868,7 @@ forms::les emails ne correspondent pas E-mails do not match. - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::les mots de passe ne correspondent pas @@ -10041,12 +10085,12 @@ See documentation for more examples https://docs.phraseanet.com login::notification: Changements enregistres Changes saved - Controller/Root/AccountController.php + Controller/Root/AccountController.php login::notification: Mise a jour du mot de passe avec succes Password update done - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Root/LoginController.php @@ -10085,12 +10129,12 @@ See documentation for more examples https://docs.phraseanet.com login::register:email: Vous avez ete accepte sur les collections suivantes : Your access has been granted on these bases and collections: - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Your access has been denied to the following databases and collections: - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -10725,6 +10769,51 @@ See documentation for more examples https://docs.phraseanet.com Do not display anymore Controller/Prod/LanguageController.php + + phraseanet::account The account has been deleted + phraseanet::account The account has been deleted + Controller/Root/AccountController.php + + + > ]]> + > ]]> + web/account/account.html.twig + + + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + Controller/Root/AccountController.php + + + phraseanet::account: Are you sure you want to delete your account? + phraseanet::account: Are you sure you want to delete your account? + web/account/account.html.twig + + + phraseanet::account: Delete my account + phraseanet::account: Delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account + phraseanet::account: I am agree to delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account, need confirmation on mail + phraseanet::account: I am agree to delete my account, need confirmation on mail + web/account/account.html.twig + + + phraseanet::account: List of data to be deleted + phraseanet::account: List of data to be deleted + web/account/account.html.twig + + + phraseanet::account: My phraseanet account + phraseanet::account: My phraseanet account + web/account/account.html.twig + phraseanet::chargement Loading @@ -10755,7 +10844,9 @@ See documentation for more examples https://docs.phraseanet.com phraseanet::erreur: echec du serveur de mail Mail-server error - Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php phraseanet::jours:: dimanche diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 0fef563ea1..2fce4d7463 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -499,7 +499,7 @@ A task has been creted, please run it to complete empty collection Une tâche de suppression a été créée, lancez la pour vider la collection - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. @@ -953,17 +953,17 @@ Controller/Prod/LazaretController.php Controller/Prod/ToolsController.php Controller/Prod/BasketController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxesController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -1023,7 +1023,7 @@ Controller/Api/V1Controller.php Controller/Prod/BasketController.php Controller/Admin/SearchEngineController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php web/admin/statusbit.html.twig @@ -1406,7 +1406,7 @@ Bad request format, only JSON is allowed Mauvais format de requête. Seul JSON est autorisé. - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php Controller/Admin/DataboxController.php @@ -1821,7 +1821,7 @@ Collection empty successful Collection vidée avec succès - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Collection order @@ -1993,7 +1993,7 @@ Could not perform request, please contact an administrator. Impossible d'exécuter la requête. Veuillez contacter un administrateur. - Controller/Root/AccountController.php + Controller/Root/AccountController.php Could not retrieve the file ID, please retry or contact an admin if problem persist @@ -2362,6 +2362,11 @@ prod/upload/lazaret.html.twig admin/task-manager/templates.html.twig + + Delete account successfull + Delete account successfull + Notification/Mail/MailSuccessAccountDelete.php + Delete all users rights Supprimer tous les droits de l'utilisateur @@ -2753,7 +2758,7 @@ Email '%email%' for login '%login%' already exists in database L'adresse e-mail '%email%' pour l'identifiant '%login%' existe déjà dans le base - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -2786,6 +2791,27 @@ Résultat du test d'e-mail : %email_status% web/admin/dashboard.html.twig + + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:subject Delete account confirmation + Email:deletion:request:subject Delete account confirmation + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:textButton Delete my account + Email:deletion:request:textButton Delete my account + Notification/Mail/MailRequestAccountDelete.php + Emails E-mails @@ -2820,8 +2846,8 @@ Empty the collection before removing Videz la collection avant de la supprimer - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3078,7 +3104,7 @@ Error while sending the file Erreur lors de l'envoi du fichier - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3745,7 +3771,7 @@ Invalid file format Format de fichier incorrect - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3769,7 +3795,7 @@ Invalid labels parameter Paramètre de label incorrect - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3780,7 +3806,7 @@ Invalid password provided Mot de passe fournis invalide. - Controller/Root/AccountController.php + Controller/Root/AccountController.php Invalid target collection @@ -3964,7 +3990,7 @@ Le contenu de cet email est confidentiel, ne le divulguez pas. Le contenu de cet e-mail est confidentiel. Ne le divulguez pas. - templates/web/email-template.html.twig + templates/web/email-template.html.twig Le nom de base de donnee est incorrect @@ -4139,17 +4165,17 @@ Login %login% already exists in database L'identifiant %login% existe déjà dans la base de données - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% L'identifiant %login% est déjà mentionné dans le fichier à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty L'identifiant n'est pas renseigné à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4171,7 +4197,7 @@ Mail line %line% is empty L'adresse e-mail n'est pas renseignée à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4257,7 +4283,7 @@ Message automatique de Phraseanet Message automatique de Phraseanet - templates/web/email-template.html.twig + templates/web/email-template.html.twig Mettre a jour @@ -4287,7 +4313,7 @@ Missing labels parameter Paramètre de label manquant - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -4298,7 +4324,7 @@ Missing name parameter Paramètre de nom manquant - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4387,6 +4413,11 @@ Multivalué admin/fields/templates.html.twig + + My application + My application + web/account/account.html.twig + My baskets Mes Paniers @@ -4466,6 +4497,7 @@ No Non + web/account/account.html.twig web/developers/applications.html.twig @@ -4841,6 +4873,7 @@ Paniers Paniers + web/account/account.html.twig web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -4869,7 +4902,7 @@ Password is empty at line %line% Le mot de passe est vide à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -5077,7 +5110,7 @@ Pour gérer l'envoi d'email automatique, connectez-vous à %link% Pour régler les préférences de réception d'e-mails automatiques, connectez-vous à %link% - templates/web/email-template.html.twig + templates/web/email-template.html.twig Preference saved ! @@ -6359,22 +6392,22 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Successful removal Suppression effectuée - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Mise à jour réussie - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -6604,7 +6637,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The file is too big Le fichier est trop gros - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6620,7 +6653,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The publication has been stopped La publication a été suspendue - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6745,7 +6778,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This link is valid until Ce lien est valide jusqu'au - templates/web/email-template.html.twig + templates/web/email-template.html.twig This option disables the selecting of the databases on which a user can register himself, and registration is made on all granted databases. @@ -6815,6 +6848,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Jeton web/developers/application.html.twig + + Token not found + Token not found + Controller/Root/AccountController.php + Tool box Outils @@ -6945,12 +6983,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to create template, the name is already used. Impossible le créer le modèle, le nom donné est déjà utilisé. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Impossible de créer l'utilisateur. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -7607,6 +7645,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Yes Oui + web/account/account.html.twig user/import/view.html.twig web/developers/applications.html.twig @@ -7895,10 +7934,15 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Vos documents et leurs sous-résolutions (vignettes, prévisualisation et autres sous-définitions) sont stockés dans ces répertoires web/setup/step2.html.twig + + Your phraseanet account on %urlInstance% has been deleted! + Your phraseanet account on %urlInstance% has been deleted! + Notification/Mail/MailSuccessAccountDelete.php + Your registration requests have been taken into account. Les demandes d'inscription ont été prises en compte. - Controller/Root/AccountController.php + Controller/Root/AccountController.php a propos @@ -8398,7 +8442,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur activite Activité Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8407,7 +8451,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur adresse Adresse Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8422,7 +8466,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur code postal Code postal Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8446,7 +8490,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur email E-mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8458,7 +8502,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8495,7 +8539,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Nom Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8510,14 +8554,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur pays Pays - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/users.html.twig admin::compte-utilisateur poste Poste Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8528,7 +8572,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Prénom Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8545,7 +8589,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur societe Société Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8561,7 +8605,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur telephone Téléphone - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8571,13 +8615,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer Un e-mail de confirmation vient de vous être envoyé. Veuillez suivre les instructions contenues dans celui-ci pour continuer - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur ville Ville Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8585,7 +8629,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur: L'email a correctement ete mis a jour L'adresse e-mail a été mise à jour - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ? @@ -8606,7 +8650,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::compte-utilisateur: erreur lors de la mise a jour La mise à jour a échoué - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur::securite caracteres majuscules @@ -8642,7 +8686,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::compte-utilisateur:ftp: Le mot de passe est errone Le mot de passe est erroné - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur:ftp: Nombre d'essais max @@ -9793,7 +9837,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le forms::l'email semble invalide L'e-mail semble invalide - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::la valeur donnee est trop courte @@ -9824,7 +9868,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le forms::les emails ne correspondent pas Les e-mails ne correspondent pas - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::les mots de passe ne correspondent pas @@ -10040,12 +10084,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login::notification: Changements enregistres Changements confirmés - Controller/Root/AccountController.php + Controller/Root/AccountController.php login::notification: Mise a jour du mot de passe avec succes Mise à jour du mot de passe effectuée - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Root/LoginController.php @@ -10084,12 +10128,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login::register:email: Vous avez ete accepte sur les collections suivantes : Votre accès a été validé pour les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Votre accès a été refusé pour les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -10724,6 +10768,51 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Ne plus afficher ce message Controller/Prod/LanguageController.php + + phraseanet::account The account has been deleted + phraseanet::account The account has been deleted + Controller/Root/AccountController.php + + + > ]]> + > ]]> + web/account/account.html.twig + + + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + Controller/Root/AccountController.php + + + phraseanet::account: Are you sure you want to delete your account? + phraseanet::account: Are you sure you want to delete your account? + web/account/account.html.twig + + + phraseanet::account: Delete my account + phraseanet::account: Delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account + phraseanet::account: I am agree to delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account, need confirmation on mail + phraseanet::account: I am agree to delete my account, need confirmation on mail + web/account/account.html.twig + + + phraseanet::account: List of data to be deleted + phraseanet::account: List of data to be deleted + web/account/account.html.twig + + + phraseanet::account: My phraseanet account + phraseanet::account: My phraseanet account + web/account/account.html.twig + phraseanet::chargement Chargement @@ -10754,7 +10843,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::erreur: echec du serveur de mail Echec du serveur de mails - Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php phraseanet::jours:: dimanche diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index d9423e27b7..be73e4a7c2 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -503,7 +503,7 @@ A task has been creted, please run it to complete empty collection Een taak werd gemaakt, gelieve deze op een volledig lege collectie uit te voeren - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. @@ -958,17 +958,17 @@ Controller/Prod/LazaretController.php Controller/Prod/ToolsController.php Controller/Prod/BasketController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxesController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -1028,7 +1028,7 @@ Controller/Api/V1Controller.php Controller/Prod/BasketController.php Controller/Admin/SearchEngineController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php web/admin/statusbit.html.twig @@ -1411,7 +1411,7 @@ Bad request format, only JSON is allowed Slecht verzoek formaat, enkel JSON is toegestaan - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php Controller/Admin/DataboxController.php @@ -1827,7 +1827,7 @@ Collection empty successful Collectie met succes geledigd - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Collection order @@ -1999,7 +1999,7 @@ Could not perform request, please contact an administrator. Kon uw aanvraag niet behandelen, gelieve contact op te nemen met een beheerder - Controller/Root/AccountController.php + Controller/Root/AccountController.php Could not retrieve the file ID, please retry or contact an admin if problem persist @@ -2369,6 +2369,11 @@ prod/upload/lazaret.html.twig admin/task-manager/templates.html.twig + + Delete account successfull + Delete account successfull + Notification/Mail/MailSuccessAccountDelete.php + Delete all users rights Verwijder alle gebruikersrechten @@ -2760,7 +2765,7 @@ Email '%email%' for login '%login%' already exists in database Email '%email%' for login '%login%' already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -2793,6 +2798,27 @@ Email test resultaat : %email_status% web/admin/dashboard.html.twig + + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour. + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:subject Delete account confirmation + Email:deletion:request:subject Delete account confirmation + Notification/Mail/MailRequestAccountDelete.php + + + Email:deletion:request:textButton Delete my account + Email:deletion:request:textButton Delete my account + Notification/Mail/MailRequestAccountDelete.php + Emails Emails @@ -2827,8 +2853,8 @@ Empty the collection before removing Maak eerst de collectie leeg alvorens te verwijderen - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3085,7 +3111,7 @@ Error while sending the file Fout bij het versturen van het bestaan - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3752,7 +3778,7 @@ Invalid file format Ongeldige bestandsindeling - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3776,7 +3802,7 @@ Invalid labels parameter Ongeldige parameter voor labels - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3787,7 +3813,7 @@ Invalid password provided Ongeldig wachtwoord opgegeven - Controller/Root/AccountController.php + Controller/Root/AccountController.php Invalid target collection @@ -3971,7 +3997,7 @@ Le contenu de cet email est confidentiel, ne le divulguez pas. De inhoud van deze mail is confidentieel, geef hem niet vrij. - templates/web/email-template.html.twig + templates/web/email-template.html.twig Le nom de base de donnee est incorrect @@ -4146,17 +4172,17 @@ Login %login% already exists in database Login %login% already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Login %login% is already defined in the file at line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Login line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4178,7 +4204,7 @@ Mail line %line% is empty Mail line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4264,7 +4290,7 @@ Message automatique de Phraseanet Automatishe melding van Phraseanet - templates/web/email-template.html.twig + templates/web/email-template.html.twig Mettre a jour @@ -4294,7 +4320,7 @@ Missing labels parameter Ontbrekende parameter voor labels - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -4305,7 +4331,7 @@ Missing name parameter Ontbrekende parameter voor naam - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4394,6 +4420,11 @@ Meerde waarden admin/fields/templates.html.twig + + My application + My application + web/account/account.html.twig + My baskets Mijn mandjes @@ -4473,6 +4504,7 @@ No Nee + web/account/account.html.twig web/developers/applications.html.twig @@ -4848,6 +4880,7 @@ Paniers Mandjes + web/account/account.html.twig web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -4876,7 +4909,7 @@ Password is empty at line %line% Password is empty at line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -5084,7 +5117,7 @@ Pour gérer l'envoi d'email automatique, connectez-vous à %link% Om het automatisch verzenden van mails, meld u dan aan à %link% - templates/web/email-template.html.twig + templates/web/email-template.html.twig Preference saved ! @@ -6364,22 +6397,22 @@ Successful removal Met succes verwijderd - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Geslaagde update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -6609,7 +6642,7 @@ The file is too big Het bestand is te groot - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6625,7 +6658,7 @@ The publication has been stopped Het programma is gestopt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6750,7 +6783,7 @@ This link is valid until This link is valid until - templates/web/email-template.html.twig + templates/web/email-template.html.twig This option disables the selecting of the databases on which a user can register himself, and registration is made on all granted databases. @@ -6820,6 +6853,11 @@ Token web/developers/application.html.twig + + Token not found + Token not found + Controller/Root/AccountController.php + Tool box Gereedschappen @@ -6950,12 +6988,12 @@ Unable to create template, the name is already used. Unable to create template, the name is already used. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unable to create the user. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -7612,6 +7650,7 @@ Yes Ja + web/account/account.html.twig user/import/view.html.twig web/developers/applications.html.twig @@ -7900,10 +7939,15 @@ Uw media en hun thumbnails (voorvertoningen, thumbnails..) worden in deze mappen opgeslagen. web/setup/step2.html.twig + + Your phraseanet account on %urlInstance% has been deleted! + Your phraseanet account on %urlInstance% has been deleted! + Notification/Mail/MailSuccessAccountDelete.php + Your registration requests have been taken into account. Your registration requests have been taken into account. - Controller/Root/AccountController.php + Controller/Root/AccountController.php a propos @@ -8403,7 +8447,7 @@ admin::compte-utilisateur activite Activiteit Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8412,7 +8456,7 @@ admin::compte-utilisateur adresse Adres Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8427,7 +8471,7 @@ admin::compte-utilisateur code postal Postcode Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8451,7 +8495,7 @@ admin::compte-utilisateur email Email Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8463,7 +8507,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8500,7 +8544,7 @@ Naam Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8515,14 +8559,14 @@ admin::compte-utilisateur pays Land - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/users.html.twig admin::compte-utilisateur poste Postcode Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8533,7 +8577,7 @@ Voornaam Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8550,7 +8594,7 @@ admin::compte-utilisateur societe Bedrijf Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/users.html.twig @@ -8566,7 +8610,7 @@ admin::compte-utilisateur telephone Telefoon - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/admin/connected-users.html.twig @@ -8576,13 +8620,13 @@ admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer Een bevestigingsemail werd u gestuurd. Om verder te gaan gelieve de instructies van deze mail te volgen - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur ville Star Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/account/account.html.twig web/admin/editusers.html.twig web/common/dialog_export.html.twig @@ -8590,7 +8634,7 @@ admin::compte-utilisateur: L'email a correctement ete mis a jour Het email adres werd met succes up to date gezet - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ? @@ -8610,7 +8654,7 @@ admin::compte-utilisateur: erreur lors de la mise a jour Fout tijdens de update - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur::securite caracteres majuscules @@ -8646,7 +8690,7 @@ admin::compte-utilisateur:ftp: Le mot de passe est errone Het paswoord is onjuist - Controller/Root/AccountController.php + Controller/Root/AccountController.php admin::compte-utilisateur:ftp: Nombre d'essais max @@ -9797,7 +9841,7 @@ forms::l'email semble invalide Het email adres blijkt niet geldig te zijn - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::la valeur donnee est trop courte @@ -9828,7 +9872,7 @@ forms::les emails ne correspondent pas Ee email adressen zijn niet gelijk - Controller/Root/AccountController.php + Controller/Root/AccountController.php forms::les mots de passe ne correspondent pas @@ -10044,12 +10088,12 @@ login::notification: Changements enregistres Veranderingen zijn bewaard - Controller/Root/AccountController.php + Controller/Root/AccountController.php login::notification: Mise a jour du mot de passe avec succes Update van het paswoord met succes uitgevoerd - Controller/Root/AccountController.php + Controller/Root/AccountController.php Controller/Root/LoginController.php @@ -10088,12 +10132,12 @@ login::register:email: Vous avez ete accepte sur les collections suivantes : login::register:email: Vous avez ete accepte sur les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : login::register:email: Vous avez ete refuse sur les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -10728,6 +10772,51 @@ Deze melding niet meer tonen Controller/Prod/LanguageController.php + + phraseanet::account The account has been deleted + phraseanet::account The account has been deleted + Controller/Root/AccountController.php + + + > ]]> + > ]]> + web/account/account.html.twig + + + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion + Controller/Root/AccountController.php + + + phraseanet::account: Are you sure you want to delete your account? + phraseanet::account: Are you sure you want to delete your account? + web/account/account.html.twig + + + phraseanet::account: Delete my account + phraseanet::account: Delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account + phraseanet::account: I am agree to delete my account + web/account/account.html.twig + + + phraseanet::account: I am agree to delete my account, need confirmation on mail + phraseanet::account: I am agree to delete my account, need confirmation on mail + web/account/account.html.twig + + + phraseanet::account: List of data to be deleted + phraseanet::account: List of data to be deleted + web/account/account.html.twig + + + phraseanet::account: My phraseanet account + phraseanet::account: My phraseanet account + web/account/account.html.twig + phraseanet::chargement Laden @@ -10758,7 +10847,9 @@ phraseanet::erreur: echec du serveur de mail De email server is mislukt - Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php + Controller/Root/AccountController.php phraseanet::jours:: dimanche diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 28f25a8115..8907e430b3 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index e98df09634..f6f34ba4d5 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index cf0678062e..460adfcbf9 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 89856882a0..e51d1a1f57 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig index 1dfbdde75f..e8354b3f32 100644 --- a/templates/web/account/account.html.twig +++ b/templates/web/account/account.html.twig @@ -232,12 +232,93 @@
-
+
+
+ +
+ + {% if not user.isadmin() and not user.hasLdapCreated() and (owned_feeds|length == 0) and (initiated_validations|length == 0) %} + + {{ 'phraseanet::account: Delete my account' | trans }} + + + + + {% else %} +

{{ "phraseanet::account: << your account can be deleted via admin interface >> " | trans }}

+ {% endif %} + +
+
+ + + + {% endblock %} diff --git a/templates/web/email-template.html.twig b/templates/web/email-template.html.twig index 44a91853e3..6eb1f9c6fb 100644 --- a/templates/web/email-template.html.twig +++ b/templates/web/email-template.html.twig @@ -49,7 +49,13 @@
- <%= user.display_name %> + <%= htmlEncode(user.display_name) %>
- <%= user.subtitle || '' %> + <%= htmlEncode(user.subtitle) || '' %>
 ?  "+sy.getAttribute("v")+" "+ v +"
- + @@ -72,7 +78,7 @@ {{ senderMail }}
{% endif %}
- {{ messageText | nl2br }} + {{ messageText | raw | nl2br }}
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/RepositoriesServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/RepositoriesServiceProviderTest.php index 0f5ede251b..f092131c22 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Provider/RepositoriesServiceProviderTest.php +++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/RepositoriesServiceProviderTest.php @@ -19,6 +19,7 @@ class RepositoriesServiceProviderTest extends ServiceProviderTestCase ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.baskets', 'Alchemy\Phrasea\Model\Repositories\BasketRepository'], ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.basket-elements', 'Alchemy\Phrasea\Model\Repositories\BasketElementRepository'], ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.validation-participants', 'Alchemy\Phrasea\Model\Repositories\ValidationParticipantRepository'], + ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.validation-session', 'Alchemy\Phrasea\Model\Repositories\ValidationSessionRepository'], ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.story-wz', 'Alchemy\Phrasea\Model\Repositories\StoryWZRepository'], ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.orders', 'Alchemy\Phrasea\Model\Repositories\OrderRepository'], ['Alchemy\Phrasea\Core\Provider\RepositoriesServiceProvider', 'repo.order-elements', 'Alchemy\Phrasea\Model\Repositories\OrderElementRepository'], diff --git a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailRequestAccountDeleteTest.php b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailRequestAccountDeleteTest.php new file mode 100644 index 0000000000..126f07109d --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailRequestAccountDeleteTest.php @@ -0,0 +1,66 @@ +assertEquals('Email:deletion:request:message Hello %civility% %firstName% %lastName%. + We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below. + If you are not at the origin of this request, please change your password as soon as possible %resetPassword% + Link is valid for one hour.', $this->getMail()->getMessage()); + } + + public function testShouldThrowALogicExceptionIfNoUserProvided() + { + $mail = MailRequestAccountDelete::create( + $this->getApplication(), + $this->getReceiverMock(), + $this->getEmitterMock(), + $this->getMessage(), + $this->getUrl(), + $this->getExpiration() + ); + + try { + $mail->getMessage(); + $this->fail('Should have raised an exception'); + } catch (LogicException $e) { + + } + } + + public function getMail() + { + $mail = MailRequestAccountDelete::create( + $this->getApplication(), + $this->getReceiverMock(), + $this->getEmitterMock(), + $this->getMessage(), + $this->getUrl(), + $this->getExpiration() + ); + + $user = $this->createUserMock(); + + $user->expects($this->any()) + ->method('getDisplayName') + ->will($this->returnValue('JeanPhil')); + + $mail->setUserOwner($user); + + return $mail; + } +} diff --git a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailSuccessAccountDeleteTest.php b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailSuccessAccountDeleteTest.php new file mode 100644 index 0000000000..1830780e3b --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailSuccessAccountDeleteTest.php @@ -0,0 +1,23 @@ +getApplication(), + $this->getReceiverMock(), + $this->getEmitterMock(), + $this->getMessage() + ); + } +} From 4203a814a4accd68b58c8dd2f7d40a95510fc045 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Wed, 17 Apr 2019 17:47:45 +0200 Subject: [PATCH 08/21] PHRAS-2533 Inject containers hostname on /etc/hosts file --- .../roles/vagrant_local/tasks/docker-hosts-container.yml | 4 ++++ resources/ansible/roles/vagrant_local/tasks/main.yml | 2 ++ resources/ansible/vars/all.yml | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml diff --git a/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml b/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml new file mode 100644 index 0000000000..83c6bfeec9 --- /dev/null +++ b/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml @@ -0,0 +1,4 @@ +--- +- name: Update /etc/hosts + lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.docker-hosts-container|default('') }}' owner=root group=root mode=0644 + when: vagrant_local.vm.docker-hosts-container is defined \ No newline at end of file diff --git a/resources/ansible/roles/vagrant_local/tasks/main.yml b/resources/ansible/roles/vagrant_local/tasks/main.yml index 619c3b4260..33de639dac 100644 --- a/resources/ansible/roles/vagrant_local/tasks/main.yml +++ b/resources/ansible/roles/vagrant_local/tasks/main.yml @@ -10,3 +10,5 @@ - name: Update /etc/hosts lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.hostname|default('') }}' owner=root group=root mode=0644 when: vagrant_local.vm.hostname is defined + +- include: docker-hosts-container.yml \ No newline at end of file diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index e1282c99b5..c9fba96c69 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -48,6 +48,8 @@ vagrant_local: sharedfolder: ./ useVagrantCloud: '1' syncType: nfs + hostname: '' + docker-hosts-container: 'db elasticsearch redis rabbitmq' nginx: install: '1' docroot: /vagrant From aa65192102b26d8405bc8f07be1a5324782a29c7 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 18 Apr 2019 12:13:33 +0200 Subject: [PATCH 09/21] adding phraseanet-docker hostnames to circleci hosts --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76f7c42a12..4c43023f89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,6 +34,7 @@ jobs: # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly - v1-dep- # This is based on your 1.0 configuration file or project settings + - run: echo 127.0.0.1 redis elasticsearch db rabbitmq | sudo tee -a /etc/hosts - run: git clone https://github.com/alanxz/rabbitmq-c - run: cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a - run: cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install From 83b21da377985c1a7198016e390b36c3b8b998f9 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Thu, 18 Apr 2019 17:14:37 +0200 Subject: [PATCH 10/21] PHRAS-2533 Inject docker dependencies, typo fix --- .../roles/vagrant_local/tasks/docker-hosts-container.yml | 4 ++-- resources/ansible/vars/all.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml b/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml index 83c6bfeec9..794961f90c 100644 --- a/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml +++ b/resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml @@ -1,4 +1,4 @@ --- - name: Update /etc/hosts - lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.docker-hosts-container|default('') }}' owner=root group=root mode=0644 - when: vagrant_local.vm.docker-hosts-container is defined \ No newline at end of file + lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.docker_hosts_container|default('') }}' owner=root group=root mode=0644 + when: vagrant_local.vm.docker_hosts_container is defined \ No newline at end of file diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index c9fba96c69..5cdf9f6a51 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -49,7 +49,7 @@ vagrant_local: useVagrantCloud: '1' syncType: nfs hostname: '' - docker-hosts-container: 'db elasticsearch redis rabbitmq' + docker_hosts_container: 'db elasticsearch redis rabbitmq' nginx: install: '1' docroot: /vagrant From 79e33fcae18b34c04fd2f519cd83a19431310125 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Fri, 19 Apr 2019 18:46:46 +0200 Subject: [PATCH 11/21] PHRAS-2496 Pre-build vagrant image for Phraseanet and implement it in Phraseanet vagrant file --- Vagrantfile | 2 +- resources/ansible/playbook.yml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 4e71464ef1..71a5a721e9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -119,7 +119,7 @@ Vagrant.configure("2") do |config| ] end - config.vm.box = "ubuntu/trusty64" + config.vm.box = "alchemy/Phraseanet-vagrant-dev" config.ssh.forward_agent = true config_net(config) diff --git a/resources/ansible/playbook.yml b/resources/ansible/playbook.yml index a2969de18c..704c5b96ec 100644 --- a/resources/ansible/playbook.yml +++ b/resources/ansible/playbook.yml @@ -4,18 +4,18 @@ vars_files: - vars/all.yml roles: - - server - - repositories - - vagrant_local - - nginx - - mariadb - - elasticsearch - - rabbitmq - - php - - xdebug - - composer - - mailcatcher - - node - - yarn +# - server +# - repositories +# - vagrant_local +# - nginx +# - mariadb +# - elasticsearch +# - rabbitmq +# - php +# - xdebug +# - composer +# - mailcatcher +# - node +# - yarn +# - ffmpeg - app - - ffmpeg From 47d974a466ea231d50938fb0c267a58d71ca1f94 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 23 Apr 2019 12:10:25 +0400 Subject: [PATCH 12/21] PHRAS-2497 #comment port to 4.1 Search issue when query mix data from Public and Private field #time 2h --- .../Elastic/AST/QuotedTextNode.php | 2 +- .../SearchEngine/Elastic/AST/RawNode.php | 2 +- .../SearchEngine/Elastic/AST/TermNode.php | 6 ++++-- .../SearchEngine/Elastic/AST/TextNode.php | 9 ++++----- .../Elastic/Search/QueryHelper.php | 6 +++--- .../SearchEngine/AST/QuotedTextNodeTest.php | 16 +++++++++++++--- .../Phrasea/SearchEngine/AST/TermNodeTest.php | 10 ++++++++-- .../Phrasea/SearchEngine/AST/TextNodeTest.php | 19 ++++++++++++++++--- 8 files changed, 50 insertions(+), 20 deletions(-) diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php index 8d2d5fd9ad..8c330545fd 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php @@ -43,7 +43,7 @@ class QuotedTextNode extends Node $private_fields = $context->getPrivateFields(); $private_fields = ValueChecker::filterByValueCompatibility($private_fields, $this->text); - foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) { + foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) { $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php index 784fadcbfa..c6cdd7d5cc 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php @@ -61,7 +61,7 @@ class RawNode extends Node $private_fields = $context->getPrivateFields(); $private_fields = ValueChecker::filterByValueCompatibility($private_fields, $this->text); - foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) { + foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) { $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php index 8066fa756c..c587c54592 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php @@ -19,9 +19,11 @@ class TermNode extends AbstractTermNode return $query; }; - $query = $query_builder($context->getUnrestrictedFields()); + $unrestricted_fields = $context->getUnrestrictedFields(); $private_fields = $context->getPrivateFields(); - foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $concept_query) { + $query = $query_builder($unrestricted_fields); + + foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $concept_query) { $query = QueryHelper::applyBooleanClause($query, 'should', $concept_query); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php index 49b8d49da9..4bc98ec6b9 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php @@ -66,12 +66,11 @@ class TextNode extends AbstractTermNode implements ContextAbleInterface return $query; }; - // Unrestricted fields - $query = $query_builder($context->getUnrestrictedFields()); - - // Private fields + $unrestricted_fields = $context->getUnrestrictedFields(); $private_fields = $context->getPrivateFields(); - foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) { + + $query = $query_builder($unrestricted_fields); + foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) { $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php index 746266e341..1acdd5935c 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php @@ -10,13 +10,13 @@ class QueryHelper { private function __construct() {} - public static function wrapPrivateFieldQueries(array $fields, \Closure $query_builder) + public static function wrapPrivateFieldQueries(array $private_fields, array $unrestricted_fields, \Closure $query_builder) { // We make a boolean clause for each collection set to shrink query size // (instead of a clause for each field, with his collection set) $fields_map = []; $collections_map = []; - foreach ($fields as $field) { + foreach ($private_fields as $field) { $collections = $field->getDependantCollections(); $hash = self::hashCollections($collections); $collections_map[$hash] = $collections; @@ -31,7 +31,7 @@ class QueryHelper foreach ($fields_map as $hash => $fields) { // Right to query on a private field is dependant of document collection // Here we make sure we can only match on allowed collections - $query = $query_builder($fields); + $query = $query_builder(array_merge($fields, $unrestricted_fields)); if ($query !== null) { $queries[] = self::restrictQueryToCollections($query, $collections_map[$hash]); } diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/QuotedTextNodeTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/QuotedTextNodeTest.php index dc5e9995a5..c667e3ff62 100644 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/QuotedTextNodeTest.php +++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/QuotedTextNodeTest.php @@ -47,7 +47,9 @@ class QuotedTextNodeTest extends \PHPUnit_Framework_TestCase public function testQueryBuildWithPrivateFields() { - $public_field = new Field('foo', FieldMapping::TYPE_STRING, ['private' => false]); + $public_field = new Field('foo', FieldMapping::TYPE_STRING, [ + 'private' => false + ]); $private_field = new Field('bar', FieldMapping::TYPE_STRING, [ 'private' => true, 'used_by_collections' => [1, 2, 3] @@ -75,7 +77,10 @@ class QuotedTextNodeTest extends \PHPUnit_Framework_TestCase "should": [{ "multi_match": { "type": "phrase", - "fields": ["foo.fr", "foo.en"], + "fields": [ + "foo.fr", + "foo.en" + ], "query": "baz", "lenient": true } @@ -89,7 +94,12 @@ class QuotedTextNodeTest extends \PHPUnit_Framework_TestCase "query": { "multi_match": { "type": "phrase", - "fields": ["private_caption.bar.fr", "private_caption.bar.en"], + "fields": [ + "private_caption.bar.fr", + "private_caption.bar.en", + "foo.fr", + "foo.en" + ], "query": "baz", "lenient": true } diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TermNodeTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TermNodeTest.php index d78422d30a..aa68edbfbd 100644 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TermNodeTest.php +++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TermNodeTest.php @@ -126,12 +126,18 @@ class TermNodeTest extends \PHPUnit_Framework_TestCase "bool": { "should": [{ "multi_match": { - "fields": ["concept_path.bar"], + "fields": [ + "concept_path.bar", + "concept_path.foo" + ], "query": "/baz" } }, { "multi_match": { - "fields": ["concept_path.bar"], + "fields": [ + "concept_path.bar", + "concept_path.foo" + ], "query": "/qux" } }] diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php index 6f954dd398..b2cde860b1 100644 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php +++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php @@ -109,7 +109,12 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase }, "query": { "multi_match": { - "fields": ["private_caption.bar.fr", "private_caption.bar.en"], + "fields": [ + "private_caption.bar.fr", + "private_caption.bar.en", + "foo.fr", + "foo.en" + ], "query": "baz", "type": "cross_fields", "operator": "and", @@ -216,7 +221,12 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase "bool": { "should": [{ "multi_match": { - "fields": ["private_caption.bar.fr", "private_caption.bar.en"], + "fields": [ + "private_caption.bar.fr", + "private_caption.bar.en", + "foo.fr", + "foo.en" + ], "query": "baz", "type": "cross_fields", "operator": "and", @@ -224,7 +234,10 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase } }, { "multi_match": { - "fields": ["concept_path.bar"], + "fields": [ + "concept_path.bar", + "concept_path.foo" + ], "query": "/qux" } }] From 035a4f95a6013ddc7caa28ca8ee79c072b2cbaba Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Tue, 23 Apr 2019 12:39:28 +0200 Subject: [PATCH 13/21] Update with old box name --- Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 71a5a721e9..1b1f577b3f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -119,7 +119,9 @@ Vagrant.configure("2") do |config| ] end + # Switch between Phraseanet box and native trusty64 config.vm.box = "alchemy/Phraseanet-vagrant-dev" + #config.vm.box = "ubuntu/trusty64" config.ssh.forward_agent = true config_net(config) From eff72083ba3f7f73808334104d4e1eab71f0c5d6 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 25 Apr 2019 17:27:33 +0400 Subject: [PATCH 14/21] update delete account config structure #time 0.5h --- config/configuration.sample.yml | 4 ++++ lib/Alchemy/Phrasea/Controller/Root/AccountController.php | 2 +- lib/conf.d/configuration.yml | 4 ++++ templates/web/account/account.html.twig | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 32adca6ce3..ddc49ca944 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -286,3 +286,7 @@ workers: user: guest password: guest vhost: / + +user_account: + deleting_policies: + email_confirmation: true diff --git a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php index e785c8f0f3..a6b305fe22 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php +++ b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php @@ -334,7 +334,7 @@ class AccountController extends Controller { $user = $this->getAuthenticatedUser(); - if($this->app['conf']->get(['main', 'delete-account-require-email-confirmation'])) { + if($this->app['conf']->get(['user_account', 'deleting_policies', 'email_confirmation'])) { // send email confirmation diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index f351d620cb..33bd2ddb84 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -241,3 +241,7 @@ video-editor: - 1 - '1.5' - 3 + +user_account: + deleting_policies: + email_confirmation: true diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig index e8354b3f32..29bccc7716 100644 --- a/templates/web/account/account.html.twig +++ b/templates/web/account/account.html.twig @@ -279,7 +279,7 @@
{{ subject }}