Changeset 20202 for extensions/Piwecard/admin/admin_configuration.php

Timestamp:

Jan 17, 2013, 12:06:49 AM (11 years ago)

Author:

julien1311

Message:

[piwecard] several changes (almost 2.4.a.b4)

File:

• extensions/Piwecard/admin/admin_configuration.php (modified) (3 diffs)

extensions/Piwecard/admin/admin_configuration.php

@@ -33 +33 @@
     $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 +93 @@
 
 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 +131 @@
 $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"' : '');