Changeset 20421

Timestamp:

Jan 27, 2013, 2:34:55 PM (12 years ago)

Author:

julien1311

Message:

[piwecard] email preview in admin

Location:

extensions/Piwecard

Files:

• admin/images/image_thumb.jpg (added)
• admin/template/admin_configuration.tpl (modified) (1 diff)
• include/parse_param.inc.php (moved) (moved from extensions/Piwecard/include/config_param.inc.php) (2 diffs)
• include/piwecard.class.php (modified) (1 diff)
• mail/template/mail_html.tpl (modified) (2 diffs)
• template/ecard.tpl (modified) (2 diffs)
• ws/ws_functions.inc.php (modified) (2 diffs)

extensions/Piwecard/admin/template/admin_configuration.tpl

@@ -24 +24 @@
                         if (data.stat =='ok') {
                                 $("#previewEmail").html(data.result.message);
-                                $.each(data.result.style, function(index, value) {
-                                        document.getElementById(index).setAttribute("style", value);
-                                });
                                 $.colorbox({
                                         inline:true,
                                         href:"#previewEmail",
-                                        onComplete: function(style){
+                                        onComplete: function(){
                                                 $("#cboxLoadedContent").css('text-align', 'left');
                                         }

extensions/Piwecard/include/parse_param.inc.php

@@ -3 +3 @@
 set_make_full_url();
 
-// Fichier contenant les parametres du plugin (pour le parser)
+//Parser parameters
 $ecard_parse = array(
                 '%yourname%'            => isset($values['ecard_sender_name']) ? $values['ecard_sender_name'] : ''  ,
@@ -15 +15 @@
                 '%ecardmessage%'        => isset($values['ecard_message']) ? $values['ecard_message'] : ''  ,   
                 '%pictureurl%'          => DerivativeImage::thumb_url($image_element) ,
-                '%pictureinfos%'        => isset($image_element['picture_infos']) ? $image_element['picture_infos'] : ''  ,
+                '%pictureinfos%'        => isset($image_element['picture_infos']) ? '<small>'.$image_element['picture_infos'].'</small>' : ''  ,
                 );
 

extensions/Piwecard/include/piwecard.class.php

@@ -72 +72 @@
         
         function parse($data, $values, $image_element) {
-                include (PIWECARD_PATH.'include/config_param.inc.php');
+                include (PIWECARD_PATH.'include/parse_param.inc.php');
 
                 $patterns = array();

extensions/Piwecard/mail/template/mail_html.tpl

@@ -22 +22 @@
         padding: 30px 0px 0px 30px;
         width: 732px;
+        border: none;
 }
-.email_hr {
+#email_hr {
         width: 632px;
         margin-left: 0;
@@ -45 +46 @@
                 </div>
                 <div id="email_copyright">
-                        <hr class="email_hr" />
+                        <hr id="email_hr" />
                         {'Sent by'|@translate}
                         <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a>

extensions/Piwecard/template/ecard.tpl

@@ -120 +120 @@
 {/literal}{/footer_script}
 
-</p>
 <div style="display:none">
         <div id="addECardForm">
@@ -195 +194 @@
         </div>
 </div>
-<p>
+<div>
         <a href="#" class="createECardOpen" id="createECardOpen" title="{'piwecard_send_link'|@translate}">{'piwecard_send_link'|@translate}</a>
-</p><p>
+</div>

extensions/Piwecard/ws/ws_functions.inc.php

@@ -26 +26 @@
         
         if ($format_message == 'text') {
-                $message_output = nl2br($piwecard->get_text_message($message, $smarty));
+                $message_output = nl2br($piwecard->get_text_message(stripslashes(parse($message)), $smarty));
                 $style = '';
         } elseif ($format_message == 'html') {
-                $output = $piwecard->get_html_message($message, $smarty);
+                $output = $piwecard->get_html_message(stripslashes(parse($message)), $smarty);
                 $dom_document = new DOMDocument();
                 $dom_document->loadHTML($output);
-                $style = piwecard_create_style_array($dom_document->getElementsByTagName('style')->item(0)->nodeValue);
-                $message_output = $dom_document->saveHTML($dom_document->getElementsByTagName('body')->item(0));
-                $message_output = '<div id="email_body">'.$message_output.'</div>';
+                $styles = piwecard_create_style_array($dom_document->getElementsByTagName('style')->item(0)->nodeValue);
+                $message_output = $dom_document->getElementsByTagName('body')->item(0);
+                $email_body = $dom_document->createElement('div');
+                $email_body->setAttribute('id', 'email_body');
+                $message_output->parentNode->insertBefore($email_body, $message_output);
+                $email_body->appendChild($message_output);
+                foreach ($styles as $id => $style) {
+                        $dom_document->getElementById(str_replace('#', '', $id))->setAttribute("style", $style);
+                }
+                $message_output = $dom_document->saveHTML();
         }
 
-        return array('message' => $message_output, 'style' => $style);
+        return array('message' => $message_output);
 }
 
@@ -58 +65 @@
         return $styles;
 }
+
+function parse($data) {
+        global $conf;
+        
+        set_make_full_url();
+        $ecard_parse = array(
+                        '%yourname%'            => 'Your Name',
+                        '%youremail%'           => 'Your email',
+                        '%recipientname%'       => 'Recipient name',
+                        '%recipientemail%'      => 'Recipient email',
+                        '%website%'                     => isset($conf['gallery_title']) ? $conf['gallery_title'] : '' ,
+                        '%websiteurl%'          => get_absolute_root_url() ,
+                        '%ecardurl%'            => '',
+                        '%ecardtitle%'          => 'Ecard title',
+                        '%ecardmessage%'        => 'The message of the ecard',
+                        '%pictureurl%'          => get_root_url().PIWECARD_PATH.'admin/images/image_thumb.jpg',
+                        '%pictureinfos%'        => '<small>Image infos</small>',
+                        );
+        unset_make_full_url();
+        
+        $patterns = array();
+        $replacements = array();
+        foreach ($ecard_parse as $key => $value) {
+                array_push($patterns, $key); 
+                array_push($replacements, $value);
+        }
+
+        return str_replace($patterns, $replacements, $data);
+}
 ?>