Merge pull request #228 from poldixd/master

Option to allow/disallow the user to delete the image
andreknieriem · Feb 28, 2020 · 19780ee · 19780ee
2 parents 292d149 + 313e128
commit 19780ee
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 0 deletions.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -32,6 +32,7 @@
 $config['use_filter'] = true;
 $config['default_imagefilter'] = 'plain';
 $config['disabled_filters'] = array();
+$config['allow_delete'] = true;
 $config['polaroid_effect'] = false;
 $config['polaroid_rotation'] = '0';
 $config['take_frame'] = false;

diff --git a/index.php b/index.php
@@ -171,7 +171,9 @@
 				<a href="#" class="btn imageFilter"><i class="fa fa-magic"></i> <span data-l10n="selectFilter"></span></a>
 				<?php endif; ?>
 
+				<?php if ($config['allow_delete']): ?>
 				<a href="#" class="btn deletebtn"><i class="fa fa-trash"></i> <span data-l10n="delete"></span></a>
+				<?php endif; ?>
 			</div>
 
 			<?php if ($config['use_qr']): ?>

diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
@@ -205,6 +205,11 @@
 				'environment' => 'Back facing camera'
 			],
 			'value' => $config['camera_mode']
+		],
+		'allow_delete' => [
+			'type' => 'checkbox',
+			'name' => 'allow_delete',
+			'value' => $config['allow_delete']
 		]
 	],
 	'jpeg_quality' => [

diff --git a/resources/lang/de.js b/resources/lang/de.js
@@ -12,6 +12,7 @@ const L10N = {
     'general_default_imagefilter': 'Standardbildfilter',
     'default_imagefilter': 'Bildfilter auswählen',
     'general_disabled_filters': 'Deaktivierte Bildfilter',
+    'allow_delete': 'Löschen des Bildes erlauben',
     'general_collage_cntdwn_time': 'Collage-Countdown Timer in Sekunden',
     'continuous_collage': 'Collage ohne Unterbrechung aufnehmen',
     'delete': 'Löschen',

diff --git a/resources/lang/en.js b/resources/lang/en.js
@@ -12,6 +12,7 @@ const L10N = {
     'general_default_imagefilter': 'Default image filter',
     'default_imagefilter': 'Choose image filter',
     'general_disabled_filters': 'Disabled image filters',
+    'allow_delete': 'Allow deletion of the image',
     'general_collage_cntdwn_time': 'Collage-countdown timer in seconds',
     'continuous_collage': 'Take collage without interruption',
     'delete': 'Delete',

diff --git a/resources/lang/es.js b/resources/lang/es.js
@@ -12,6 +12,7 @@ const L10N = {
     'general_default_imagefilter': 'Filtro de imagen predeterminado',
     'default_imagefilter': 'Elegir filtro de imagen',
     'general_disabled_filters': 'Filtros deshabilitados',
+    'allow_delete': 'Permitir la eliminación de la imagen',
     'general_collage_cntdwn_time': 'Cuenta regresiva del collage en segundos',
     'continuous_collage': 'Toma collage sin interrupción',
     'delete': 'Eliminar',

diff --git a/resources/lang/fr.js b/resources/lang/fr.js
@@ -12,6 +12,7 @@ const L10N = {
     'general_default_imagefilter': 'Filtre d\'image par défaut',
     'default_imagefilter': 'Choisissez le filtre d\'image',
     'general_disabled_filters': 'Filtres désactivés',
+    'allow_delete': 'Autoriser la suppression de l\'image',
     'general_collage_cntdwn_time': 'Montage photo compte à rebours en secondes',
     'continuous_collage': 'Prendre un photo montage sans interruption',
     'delete': 'Effacer',

diff --git a/resources/lang/gr.js b/resources/lang/gr.js
@@ -12,6 +12,7 @@ const L10N = {
     'general_default_imagefilter': 'Προεπιλεγμένο φίλτρο εικόνας',
     'default_imagefilter': 'Επιλέξτε φίλτρο εικόνας',
     'general_disabled_filters': 'Απενεργοποιημένα φίλτρα',
+    'allow_delete': 'Επιτρέψτε τη διαγραφή της εικόνας',
     'general_collage_cntdwn_time': 'Χρονοδιακόπτης αντίστροφης μέτρησης φωτογραφιών σε δευτερόλεπτα',
     'continuous_collage': 'Εγγραφή κολάζ χωρίς διακοπή',
     'delete': 'διαγραφή',