Changeset 20284
- Timestamp:
- Jan 20, 2013, 3:17:42 PM (11 years ago)
- Location:
- extensions/Piwecard
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Piwecard/admin/admin_management.php
r20260 r20284 134 134 } 135 135 136 $nb_ecard _valid_total = str_replace(array('%nb_valid%', '%nb_total%'), array($piwecard->get_nb_valid_ecard(), $piwecard->get_nb_ecard()), l10n('piwecard_nb_ecard_valid_total'));136 $nb_ecards_valid_total = str_replace(array('%nb_valid%', '%nb_total%'), array($piwecard->get_nb_valid_ecard(), $piwecard->get_nb_ecard()), l10n('piwecard_nb_ecard_valid_total')); 137 137 138 $template->assign('nb_ecard_valid_total', $nb_ecard_valid_total); 138 $query = 'SELECT COUNT(DISTINCT sender_email) AS nb_senders, COUNT(DISTINCT recipient_email) AS nb_recipients FROM '.PIWECARD_TABLE.' ORDER BY date_creation;'; 139 $result = pwg_db_fetch_assoc(pwg_query($query)); 140 $nb_distinct_senders_total = (empty($result['nb_senders']) ? 0 : $result['nb_senders']); 141 $nb_distinct_recipients_total = (empty($result['nb_recipients']) ? 0 : $result['nb_recipients']); 142 143 $nb_distinct_senders_recipients_total = str_replace(array('%nb_senders%', '%nb_recipients%'), array($nb_distinct_senders_total, $nb_distinct_senders_total), l10n('piwecard_nb_sender_recipient_total')); 144 145 $template->assign('nb_ecards_valid_total', $nb_ecards_valid_total); 146 $template->assign('nb_distinct_senders_recipients_total', $nb_distinct_senders_recipients_total); 139 147 $template->assign('ecard_nb_ecard_page', $piwecard->config['nb_ecard_page']); 140 148 $template->assign('navbar', $ecard_navbar); -
extensions/Piwecard/admin/template/admin_configuration.tpl
r20254 r20284 222 222 <div class="ecard_form_line ecard_email_config"> 223 223 <label for="ecard_email_message_text">{'piwecard_email_message_text'|@translate}*</label><span class="ecard_error" id="ecard_email_message_text_error" style="{$ecard_errors.email_message.text.style_error_text}"> {'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span> 224 (<a href="#" id="showPreviewTextMessage" title="{'piwecard_preview'|@translate}">{'piwecard_preview'|@translate}</a>) 224 225 <textarea name="ecard_email_message_text" id="ecard_email_message_text" {$ecard_errors.email_message.text.style_error_input}>{$ecard_email_message_text}</textarea> 225 226 </div> 226 227 <div class="ecard_form_line ecard_email_config"> 227 228 <label for="ecard_email_message_html">{'piwecard_email_message_html'|@translate}*</label><span class="ecard_error" id="ecard_email_message_html_error" style="{$ecard_errors.email_message.html.style_error_text}"> {'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span> 229 (<a href="#" id="showPreviewHTMLMessage" title="{'piwecard_preview'|@translate}">{'piwecard_preview'|@translate}</a>) 228 230 <textarea name="ecard_email_message_html" id="ecard_email_message_html" {$ecard_errors.email_message.html.style_error_input}>{$ecard_email_message_html}</textarea> 229 231 </div> -
extensions/Piwecard/admin/template/admin_management.tpl
r20254 r20284 21 21 <legend>{'piwecard_list'|@translate}</legend> 22 22 <div class="ecard_last_line"> 23 {$nb_ecard _valid_total}23 {$nb_ecards_valid_total} ({$nb_distinct_senders_recipients_total}) 24 24 </div> 25 25 </fieldset> -
extensions/Piwecard/include/piwecard.class.php
r20254 r20284 415 415 //Send an email 416 416 function mail($email_infos) { 417 global $ conf, $page, $lang_info;417 global $lang_info; 418 418 $template_mail = new Template(PIWECARD_MAIL_PATH.'template'); 419 419 $smarty = $template_mail->smarty; 420 420 421 $from = $email_infos['from_name']." <".$email_infos['from_email'].">";421 $from = '"'.$email_infos['from_name'].'" <'.$email_infos['from_email'].'>'; 422 422 $subject = encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject']))); 423 423 $boundary = '_----------='.md5(uniqid(mt_rand())); … … 436 436 437 437 if (empty($email_infos['message']['html'])) { //Text plain email 438 $headers .= 'Content-Type: text/plain; charset="'.get_pwg_charset().'"'."\n"; 438 439 $headers .= 'Content-Transfer-Encoding: 8bit'."\n"; 439 $message .= $email_infos['message']['text']; 440 $smarty->assign(array( 441 'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'], 442 'GALLERY_URL' => get_absolute_root_url(), 443 'MAIL' => get_webmaster_mail_address(), 444 ) 445 ); 446 $message .= $smarty->fetch('mail_text.tpl'); 447 $message = utf8_decode($message); 440 $message = $this->get_text_message($email_infos['message']['text'], $smarty); 448 441 } else { 449 442 $headers .= 'MIME-Version: 1.0'."\n"; … … 453 446 $message .= 'Content-Type: text/plain; charset="'.get_pwg_charset().'"'."\n"; 454 447 $message .= 'Content-Transfer-Encoding: binary'."\n\n"; 455 $message .= $email_infos['message']['text']."\n\n"; 448 $message .= $this->get_text_message($email_infos['message']['text'], $smarty); 449 $message .= "\n\n"; 456 450 $message .= '--'.$boundary."\n"; 457 451 $message .= 'Content-Type: text/html; charset="'.get_pwg_charset().'"'."\n"; 458 452 $message .= 'Content-Transfer-Encoding: binary;'."\n\n"; 459 $smarty->assign(array( 460 'CONTENT_ENCODING' => get_pwg_charset(), 461 'GALLERY_URL' => get_absolute_root_url(), 462 'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'], 463 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 464 'MAIL' => get_webmaster_mail_address(), 465 'MESSAGE_HTML' => $email_infos['message']['html'], 466 ) 467 ); 468 $message .= $smarty->fetch('mail_html.tpl'); 453 $message .= $this->get_html_message($email_infos['message']['html'], $smarty); 469 454 $message .= "\n\n"; 470 455 $message .= '--'.$boundary."--\n"; … … 473 458 mail($email_infos['to'], $subject, $message, $headers); 474 459 } 460 461 function get_text_message($message_text, $smarty) { 462 global $page, $conf; 463 464 $message = $message_text; 465 $smarty->assign(array( 466 'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'], 467 'GALLERY_URL' => get_absolute_root_url(), 468 'MAIL' => get_webmaster_mail_address(), 469 ) 470 ); 471 $message .= $smarty->fetch('mail_text.tpl'); 472 473 return $message; 474 } 475 476 function get_html_message($message_html, $smarty) { 477 global $page, $conf; 478 479 $smarty->assign(array( 480 'CONTENT_ENCODING' => get_pwg_charset(), 481 'GALLERY_URL' => get_absolute_root_url(), 482 'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'], 483 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 484 'MAIL' => get_webmaster_mail_address(), 485 'MESSAGE_HTML' => $message_html, 486 ) 487 ); 488 $message = $smarty->fetch('mail_html.tpl'); 489 490 return $message; 491 } 475 492 } 476 493 ?> -
extensions/Piwecard/install/default_values.inc.php
r20260 r20284 16 16 'display' => false, 17 17 'style' => 'solid', 18 'width' => ' 10px',18 'width' => '5px', 19 19 'color' => 'FFFFFF', 20 20 ); -
extensions/Piwecard/language/en_UK/plugin.lang.php
r20254 r20284 70 70 $lang['piwecard_list'] = 'List of e-cards'; 71 71 $lang['piwecard_nb_ecard_valid_total'] = '%nb_valid% valid e-cards out of %nb_total% e-cards'; 72 $lang['piwecard_nb_sender_recipient_total'] = '%nb_senders% unique senders and %nb_recipients% unique recipients'; 72 73 $lang['piwecard_valid'] = 'Valid'; 73 74 $lang['piwecard_invalid'] = 'Expired'; -
extensions/Piwecard/language/fr_FR/plugin.lang.php
r20254 r20284 70 70 $lang['piwecard_list'] = 'Liste des cartes virtuelles'; 71 71 $lang['piwecard_nb_ecard_valid_total'] = '%nb_valid% cartes virtuelles valides sur %nb_total% cartes virtuelles'; 72 $lang['piwecard_nb_sender_recipient_total'] = '%nb_senders% expéditeurs uniques et %nb_recipients% destinataires uniques'; 72 73 $lang['piwecard_valid'] = 'Valides'; 73 74 $lang['piwecard_invalid'] = 'Périmées';
Note: See TracChangeset
for help on using the changeset viewer.