Skip to content

Commit 19780ee

Browse files
Merge pull request #228 from poldixd/master
Option to allow/disallow the user to delete the image
2 parents 292d149 + 313e128 commit 19780ee

File tree

8 files changed

+13
-0
lines changed

8 files changed

+13
-0
lines changed

config/config.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
$config['use_filter'] = true;
3333
$config['default_imagefilter'] = 'plain';
3434
$config['disabled_filters'] = array();
35+
$config['allow_delete'] = true;
3536
$config['polaroid_effect'] = false;
3637
$config['polaroid_rotation'] = '0';
3738
$config['take_frame'] = false;

index.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@
171171
<a href="#" class="btn imageFilter"><i class="fa fa-magic"></i> <span data-l10n="selectFilter"></span></a>
172172
<?php endif; ?>
173173

174+
<?php if ($config['allow_delete']): ?>
174175
<a href="#" class="btn deletebtn"><i class="fa fa-trash"></i> <span data-l10n="delete"></span></a>
176+
<?php endif; ?>
175177
</div>
176178

177179
<?php if ($config['use_qr']): ?>

lib/configsetup.inc.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@
205205
'environment' => 'Back facing camera'
206206
],
207207
'value' => $config['camera_mode']
208+
],
209+
'allow_delete' => [
210+
'type' => 'checkbox',
211+
'name' => 'allow_delete',
212+
'value' => $config['allow_delete']
208213
]
209214
],
210215
'jpeg_quality' => [

resources/lang/de.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const L10N = {
1212
'general_default_imagefilter': 'Standardbildfilter',
1313
'default_imagefilter': 'Bildfilter auswählen',
1414
'general_disabled_filters': 'Deaktivierte Bildfilter',
15+
'allow_delete': 'Löschen des Bildes erlauben',
1516
'general_collage_cntdwn_time': 'Collage-Countdown Timer in Sekunden',
1617
'continuous_collage': 'Collage ohne Unterbrechung aufnehmen',
1718
'delete': 'Löschen',

resources/lang/en.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const L10N = {
1212
'general_default_imagefilter': 'Default image filter',
1313
'default_imagefilter': 'Choose image filter',
1414
'general_disabled_filters': 'Disabled image filters',
15+
'allow_delete': 'Allow deletion of the image',
1516
'general_collage_cntdwn_time': 'Collage-countdown timer in seconds',
1617
'continuous_collage': 'Take collage without interruption',
1718
'delete': 'Delete',

resources/lang/es.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const L10N = {
1212
'general_default_imagefilter': 'Filtro de imagen predeterminado',
1313
'default_imagefilter': 'Elegir filtro de imagen',
1414
'general_disabled_filters': 'Filtros deshabilitados',
15+
'allow_delete': 'Permitir la eliminación de la imagen',
1516
'general_collage_cntdwn_time': 'Cuenta regresiva del collage en segundos',
1617
'continuous_collage': 'Toma collage sin interrupción',
1718
'delete': 'Eliminar',

resources/lang/fr.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const L10N = {
1212
'general_default_imagefilter': 'Filtre d\'image par défaut',
1313
'default_imagefilter': 'Choisissez le filtre d\'image',
1414
'general_disabled_filters': 'Filtres désactivés',
15+
'allow_delete': 'Autoriser la suppression de l\'image',
1516
'general_collage_cntdwn_time': 'Montage photo compte à rebours en secondes',
1617
'continuous_collage': 'Prendre un photo montage sans interruption',
1718
'delete': 'Effacer',

resources/lang/gr.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const L10N = {
1212
'general_default_imagefilter': 'Προεπιλεγμένο φίλτρο εικόνας',
1313
'default_imagefilter': 'Επιλέξτε φίλτρο εικόνας',
1414
'general_disabled_filters': 'Απενεργοποιημένα φίλτρα',
15+
'allow_delete': 'Επιτρέψτε τη διαγραφή της εικόνας',
1516
'general_collage_cntdwn_time': 'Χρονοδιακόπτης αντίστροφης μέτρησης φωτογραφιών σε δευτερόλεπτα',
1617
'continuous_collage': 'Εγγραφή κολάζ χωρίς διακοπή',
1718
'delete': 'διαγραφή',

0 commit comments

Comments
 (0)