Index: /extensions/Piwecard/admin/admin_configuration.php
===================================================================
--- /extensions/Piwecard/admin/admin_configuration.php (revision 20201)
+++ /extensions/Piwecard/admin/admin_configuration.php (revision 20202)
@@ -33,5 +33,11 @@
$configuration['sender_copy'] = ((isset($_POST['ecard_sender_copy']) && $_POST['ecard_sender_copy'] == '1') ? true : false);
$configuration['image_size'] = $_POST['ecard_image_size'];
- $configuration['sender_email_change'] = ((isset($_POST['ecard_sender_email_change']) && $_POST['ecard_sender_email_change'] == '1') ? true : false);
+
+ $configuration['image_border']['display'] = ((isset($_POST['ecard_image_border']) && $_POST['ecard_image_border'] == '1') ? true : false);
+ $configuration['image_border']['style'] = $_POST['ecard_image_border_style'];
+ $configuration['image_border']['width'] = ((isset($_POST['ecard_image_border_width']) && $_POST['ecard_image_border_width'] != '1') ? $_POST['ecard_image_border_width'] : $piwecard->get_default_config_param('ecard_image_border_width'));
+ $configuration['image_border']['color'] = ((isset($_POST['ecard_image_border_color']) && $_POST['ecard_image_border_color'] != '1') ? $_POST['ecard_image_border_color'] : $piwecard->get_default_config_param('ecard_image_border_color'));
+
+ $configuration['sender_email_change'] = ((isset($_POST['ecard_sender_email_change']) && $_POST['ecard_sender_email_change'] == '1') ? true : false);
$ecard_email_format_array = array();
@@ -87,9 +93,8 @@
if (isset($_POST['reset'])) {
- require(PIWECARD_INSTALL_PATH.'default_values.inc.php');
-
- $piwecard->config['email_subject'] = $ecard_default_values['email_subject'];
- $piwecard->config['email_message']['text'] = $ecard_default_values['email_message']['text'];
- $piwecard->config['email_message']['html'] = $ecard_default_values['email_message']['html'];
+ $piwecard->config['email_subject'] = $piwecard->get_default_config_param('email_subject');
+ $email_message = $piwecard->get_default_config_param('email_message');
+ $piwecard->config['email_message']['text'] = $email_message['text'];
+ $piwecard->config['email_message']['html'] = $email_message['html'];
$piwecard->set_config();
@@ -126,4 +131,15 @@
$template->assign('generate_derivatives_types', $derivative_map);
+$template->assign('ecard_image_border', (($piwecard->config['image_border']['display']) ? 'checked="checked"' : ''));
+$template->assign('ecard_image_border_style', array(
+ 'solid' => (($piwecard->config['image_border']['style'] == 'solid') ? 'checked="checked"' : ''),
+ 'dashed' => (($piwecard->config['image_border']['style'] == 'dashed') ? 'checked="checked"' : ''),
+ 'dotted' => (($piwecard->config['image_border']['style'] == 'dotted') ? 'checked="checked"' : ''),
+ 'double' => (($piwecard->config['image_border']['style'] == 'double') ? 'checked="checked"' : ''),
+ )
+);
+$template->assign('ecard_image_border_width', $piwecard->config['image_border']['width']);
+$template->assign('ecard_image_border_color', $piwecard->config['image_border']['color']);
+
$template->assign('ecard_sender_copy', $piwecard->config['sender_copy'] ? 'checked="checked"' : '');
$template->assign('ecard_sender_email_change', $piwecard->config['sender_email_change'] ? 'checked="checked"' : '');
Index: /extensions/Piwecard/admin/admin_management.php
===================================================================
--- /extensions/Piwecard/admin/admin_management.php (revision 20201)
+++ /extensions/Piwecard/admin/admin_management.php (revision 20202)
@@ -6,5 +6,5 @@
$piwecard = get_plugin_data($plugin_id);
-$query = 'SELECT * FROM '.PIWECARD_TABLE;
+$query = 'SELECT DISTINCT ecard_id, sender_name, sender_email, title, message, image, date_creation, date_validity FROM '.PIWECARD_TABLE;
if (isset($_POST['ecard_form_filter_submit'])) {
@@ -84,5 +84,5 @@
$start = (isset($_GET['start']) ? $_GET['start'] : 0);
-if ($start != 0 and $piwecard->get_nb_ecard() == $piwecard->config['nb_ecard_page'])
+if ($start != 0 and $piwecard->get_nb_ecard() <= $piwecard->config['nb_ecard_page'])
$start = 0;
@@ -101,17 +101,29 @@
while($file = pwg_db_fetch_assoc($result)) {
- $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['id']);
+ //Recipients
+ $recipients = array();
+ $query2 = 'SELECT recipient_name, recipient_email FROM piwigo_piwecard WHERE ecard_id="'.$file['ecard_id'].'";';
+ $result2 = pwg_query($query2);
+
+ while($row = pwg_db_fetch_assoc($result2)) {
+ array_push($recipients, array(
+ 'name' => $row['recipient_name'],
+ 'email' => $row['recipient_email'],
+ )
+ );
+ }
+
+ $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['ecard_id']);
// Check if the ecard is valid
- $valid = $piwecard->is_valid($file['id']);
+ $valid = $piwecard->is_valid($file['ecard_id']);
$template->append('ecard_file',array(
- 'id' => $file['id'],
+ 'id' => $file['ecard_id'],
'title' => $file['title'],
'url' => $ecard_url,
'sender_name' => $file['sender_name'],
'sender_email' => $file['sender_email'],
- 'recipient_name' => $file['recipient_name'],
- 'recipient_email' => $file['recipient_email'],
+ 'recipients' => $recipients,
'date_creation' => strftime('%d/%m/%y %H:%M', strtotime($file['date_creation'])),
'date_validity' => (isset($file['date_validity'])) ? strftime('%d/%m/%y %H:%M', strtotime($file['date_validity'])) : l10n('piwecard_nolimit'),
Index: /extensions/Piwecard/admin/template/admin_configuration.tpl
===================================================================
--- /extensions/Piwecard/admin/template/admin_configuration.tpl (revision 20201)
+++ /extensions/Piwecard/admin/template/admin_configuration.tpl (revision 20202)
@@ -3,4 +3,6 @@
{combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
{combine_script id='piwecard' load="footer" path='plugins/Piwecard/js/piwecard.js'}
+{combine_script id='colorpicker' load="footer" path='plugins/Piwecard/js/colorpicker/js/colorpicker.js'}
+{combine_css path="plugins/Piwecard/js/colorpicker/css/colorpicker.css"}
{footer_script require="piwecard"}
@@ -31,4 +33,34 @@
$("#ecard_email_format_default_text").prop('checked', true);
}
+ });
+
+ if ($("#ecard_image_border").prop('checked') == true) {
+ $("#ecard_image_border_options").css("display","block");
+ } else {
+ $("#ecard_image_border_options").css("display","none");
+ }
+
+ $("#ecard_image_border").change(function(){
+ if ($("#ecard_image_border").prop('checked') == true) {
+ $("#ecard_image_border_options").show("fast");
+ } else {
+ $("#ecard_image_border_options").hide("fast");
+ }
+ });
+
+ $('#ecard_image_border_color').ColorPicker({
+ onSubmit: function(hsb, hex, rgb, element) {
+ $(element).val(hex);
+ $(element).ColorPickerHide();
+ },
+ onBeforeShow: function () {
+ $(this).ColorPickerSetColor(this.value);
+ },
+ onChange: function (hsb, hex, rgb) {
+ $('#ecard_image_border_color').val(hex);
+ }
+ })
+ .bind('keyup', function(){
+ $(this).ColorPickerSetColor(this.value);
});
});
@@ -110,4 +142,29 @@
{/foreach}
+
Index: /extensions/Piwecard/admin/template/admin_management.tpl
===================================================================
--- /extensions/Piwecard/admin/template/admin_management.tpl (revision 20201)
+++ /extensions/Piwecard/admin/template/admin_management.tpl (revision 20202)
@@ -103,5 +103,5 @@
- {$ecard_file.title}
+ {$ecard_file.title}
|
@@ -109,5 +109,7 @@
|
- {$ecard_file.recipient_name} ({$ecard_file.recipient_email})
+ {foreach from=$ecard_file.recipients item=recipient}
+ {$recipient.name} ({$recipient.email})
+ {/foreach}
|
@@ -123,4 +125,5 @@
+ {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
|