Changeset 7754

Show
Ignore:
Timestamp:
02/01/07 12:07:47 (1 year ago)
Author:
GamerZ
Message:

Fixed Fields BUG

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wp-email/trunk/email/email.php

    r7717 r7754  
    321321if(!function_exists('is_valid_remarks')) { 
    322322      function is_valid_remarks($content) {  
    323             $injection_strings = array('apparently-to', 'bcc', 'boundary', 'charset', 'content-disposition', 'content-type', 'content-transfer-encoding', 'errors-to', 'in-reply-to', 'message-id', 'mime-version', 'multipart/mixed', 'multipart/alternative', 'multipart/related', 'reply-to', 'x-mailer', 'x-sender', 'x-uidl');  
     323            $injection_strings = array('apparently-to', 'cc', 'bcc', 'boundary', 'charset', 'content-disposition', 'content-type', 'content-transfer-encoding', 'errors-to', 'in-reply-to', 'message-id', 'mime-version', 'multipart/mixed', 'multipart/alternative', 'multipart/related', 'reply-to', 'x-mailer', 'x-sender', 'x-uidl');  
    324324            foreach ($injection_strings as $spam) {  
    325325                  $check = strpos(strtolower($content), $spam);  
    …… 
    559559      $friendemail = strip_tags(stripslashes(trim($_POST['friendemail']))); 
    560560      $output = '<div class="wp-email">'."\n"; 
    561       $output .= '<p style="text-align: center">'.sprintf(__('E-Mail A Copy Of <strong>%s</strong> To A Friend.', 'wp-email'), get_the_title()).'</p>'."\n"; 
     561      $output .= '<p style="text-align: center">'.sprintf(__('Email a copy of <strong>%s</strong> to a Friend.', 'wp-email'), get_the_title()).'</p>'."\n"; 
    562562      // If User Click On Mail 
    563563      if(!empty($_POST['wp-email'])) { 
    …… 
    632632                        $error .= '<br /><strong>&raquo;</strong> '.sprintf(__('Maximum %s entries allowed', 'wp-email'), $multiple_max); 
    633633                  } 
     634            } 
     635            if(intval($email_fields['friendname']) == 1 && intval($email_fields['friendemail']) == 1) { 
    634636                  if($friendname_count != $friendemail_count) { 
    635637                        $error .= '<br /><strong>&raquo;</strong> '.__('Friends\' name count does not tally with friends\' email count.', 'wp-email'); 

  • wp-email/trunk/email/wp-email.pot

    r7717 r7754  
    33"Project-Id-Version: WP-EMail 2.10\n" 
    44"POT-Creation-Date: \n" 
    5 "PO-Revision-Date: 2007-01-30 20:36+0800\n" 
     5"PO-Revision-Date: 2007-02-01 20:07+0800\n" 
    66"Last-Translator: Lester 'GaMerZ' Chan <gamerz84@hotmail.com>\n" 
    77"Language-Team: Lester Chan <gamerz84@hotmail.com>\n" 
    …… 
    9494#: email.php:341 
    9595#: email.php:457 
    96 #: email.php:724 
    97 #: email.php:772 
     96#: email.php:726 
     97#: email.php:774 
    9898msgid "Success" 
    9999msgstr "" 
    …… 
    101101#: email-manager.php:127 
    102102#: email.php:471 
    103 #: email.php:736 
     103#: email.php:738 
    104104msgid "Failed" 
    105105msgstr "" 
    …… 
    290290 
    291291#: email-options.php:115 
    292 #: email.php:867 
     292#: email.php:869 
    293293msgid "Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%" 
    294294msgstr "" 
    …… 
    318318 
    319319#: email-options.php:127 
    320 #: email.php:879 
     320#: email.php:881 
    321321msgid "An Error Has Occured When Trying To Send The E-Mail" 
    322322msgstr "" 
    323323 
    324324#: email-options.php:130 
    325 #: email.php:880 
     325#: email.php:882 
    326326msgid "An Error Has Occured" 
    327327msgstr "" 
    …… 
    684684 
    685685#: email.php:508 
    686 #: email.php:735 
     686#: email.php:737 
    687687msgid "N/A" 
    688688msgstr "" 
    …… 
    690690#: email.php:561 
    691691#, php-format 
    692 msgid "E-Mail A Copy Of <strong>%s</strong> To A Friend." 
     692msgid "Email a copy of <strong>%s</strong> to a Friend." 
    693693msgstr "" 
    694694 
    …… 
    720720msgstr "" 
    721721 
    722 #: email.php:635 
     722#: email.php:637 
    723723msgid "Friends' name count does not tally with friends' email count." 
    724724msgstr "" 
    725725 
    726 #: email.php:642 
     726#: email.php:644 
    727727msgid "Image verification is empty." 
    728728msgstr "" 
    729729 
    730 #: email.php:645 
     730#: email.php:647 
    731731msgid "Image verification failed." 
    732732msgstr "" 
    733733 
    734 #: email.php:821 
     734#: email.php:823 
    735735msgid "E-Mail Image Verification" 
    736736msgstr "" 
    737737 
    738 #: email.php:824 
     738#: email.php:826 
    739739msgid "     Mail It!     " 
    740740msgstr "" 
    741741 
    742 #: email.php:830 
     742#: email.php:832 
    743743#, php-format 
    744744msgid "Please wait for <strong>%s Minutes</strong> before sending the next article." 
    745745msgstr "" 
    746746 
    747 #: email.php:868 
     747#: email.php:870 
    748748msgid "<p>Hi <strong>%EMAIL_FRIEND_NAME%</strong>,<br />Your friend, <strong>%EMAIL_YOUR_NAME%</strong>, has recommended this article entitled '<strong>%EMAIL_POST_TITLE%</strong>' to you.</p><p><strong>Here is his/her remarks:</strong><br />%EMAIL_YOUR_REMARKS%</p><p><strong>%EMAIL_POST_TITLE%</strong><br />Posted By %EMAIL_POST_AUTHOR% On %EMAIL_POST_DATE% In %EMAIL_POST_CATEGORY%</p>%EMAIL_POST_CONTENT%<p>Article taken from %EMAIL_BLOG_NAME% - <a href=\"%EMAIL_BLOG_URL%\">%EMAIL_BLOG_URL%</a><br />URL to article: <a href=\"%EMAIL_PERMALINK%\">%EMAIL_PERMALINK%</a></p>" 
    749749msgstr "" 
    750750 
    751 #: email.php:869 
     751#: email.php:871 
    752752msgid "Hi %EMAIL_FRIEND_NAME%," 
    753753msgstr "" 
    754754 
    755 #: email.php:869 
    756755#: email.php:871 
    757756#: email.php:873 
    758 #: email.php:874 
    759757#: email.php:875 
    760758#: email.php:876 
     759#: email.php:877 
     760#: email.php:878 
    761761msgid "\n" 
    762762msgstr "" 
    763763 
    764 #: email.php:870 
     764#: email.php:872 
    765765msgid "Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled '%EMAIL_POST_TITLE%' to you." 
    766766msgstr "" 
    767767 
    768 #: email.php:870 
    769768#: email.php:872 
     769#: email.php:874 
    770770msgid "" 
    771771"\n" 
    …… 
    773773msgstr "" 
    774774 
    775 #: email.php:871 
     775#: email.php:873 
    776776msgid "Here is his/her remarks:" 
    777777msgstr "" 
    778778 
    779 #: email.php:872 
     779#: email.php:874 
    780780msgid "%EMAIL_YOUR_REMARKS%" 
    781781msgstr "" 
    782782 
    783 #: email.php:873 
     783#: email.php:875 
    784784msgid "%EMAIL_POST_TITLE%" 
    785785msgstr "" 
    786786 
    787 #: email.php:874 
     787#: email.php:876 
    788788msgid "Posted By %EMAIL_POST_AUTHOR% On %EMAIL_POST_DATE% In %EMAIL_POST_CATEGORY%" 
    789789msgstr "" 
    790790 
    791 #: email.php:875 
     791#: email.php:877 
    792792msgid "%EMAIL_POST_CONTENT%" 
    793793msgstr "" 
    794794 
    795 #: email.php:876 
     795#: email.php:878 
    796796msgid "Article taken from %EMAIL_BLOG_NAME% - %EMAIL_BLOG_URL%" 
    797797msgstr "" 
    798798 
    799 #: email.php:877 
     799#: email.php:879 
    800800msgid "URL to article: %EMAIL_PERMALINK%" 
    801801msgstr "" 
    802802 
    803 #: email.php:878 
     803#: email.php:880 
    804804msgid "Article: <strong>%EMAIL_POST_TITLE%</strong> Has Been Sent To <strong>%EMAIL_FRIEND_NAME% (%EMAIL_FRIEND_EMAIL%)</strong></p>" 
    805805msgstr "" 
    806806 
    807 #: email.php:887 
     807#: email.php:889 
    808808msgid "Email This Post" 
    809809msgstr "" 
    810810 
    811 #: email.php:887 
     811#: email.php:889 
    812812msgid "Email This Page" 
    813813msgstr ""