hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3520_stamper-enhance (#4385)

Browse Source 
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.

* fix test

* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.

* fix test

* fix compatibility with download-async ; add registry/actions/stamp-subdefs=false to conf
This commit is contained in:
jygaulier
2023-11-22 12:30:55 +01:00
committed by GitHub
parent 1ccba2d9a0
commit 07f4462672
11 changed files with 732 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
View File

@@ -803,7 +803,9 @@ class CollectionController extends Controller
try {
if ('' !== trim($prefs)) {
$domdoc = new \DOMDocument();
if (true === @$domdoc->loadXML($prefs)) {
if (true === @$domdoc->loadXML($prefs, LIBXML_NONET | LIBXML_NOBLANKS)) {
$domdoc->formatOutput = true;
$domdoc->saveXML(null, LIBXML_NOEMPTYTAG);
$collection->set_prefs($domdoc);
$success = true;
}