Changeset 401

Timestamp:

08/06/08 23:29:49 (5 months ago)

Author:

082net

Message:

## ajaxcontact ##

Supports WP 2.5 or later
Requires WP 2.1 or later
Added jQuery script
Supports Akismet spam check

Location:

ajaxcontact/trunk

Files:

• . (modified) (1 prop)
• ajaxcontact.php (modified) (11 diffs)
• js/aj-contact-jquery.js (added)
• js/aj-contact-prototype.js (modified) (1 diff)
• js/mootools.js (deleted)
• js/prototype.js (deleted)
• lang (modified) (1 prop)
• lang/ajaxcontact-ko_KR.mo (modified) (previous)
• lang/ajaxcontact-ko_KR.po (modified) (2 diffs)
• lang/ajaxcontact.pot (added)
• r/aj-contact.php (modified) (3 diffs)

ajaxcontact/trunk/ajaxcontact.php

@@ -5 +5 @@
 Description: AjaxContactForm is powered by <a href="http://www.dustindiaz.com/">Dustin</a>'s <a href="http://www.dustindiaz.com/ajax-contact-form/">ajaxContactform</a>. Just write &lt;!--contact form--&gt; on page or post. This plugin supports WP 2.1 or greater and older version with <a href="http://082net.com/tag/wp-compatibility-pack/">WP-Compatibility-Pack</a>
 Author: Cheon, Young-Min
-Version: 1.3
+Version: 1.4
 Author URI: http://082net.com/
 *//*
@@ -37 +37 @@
 */
 
-if(!function_exists('wp_print_scripts')) {
-        if(strpos($_SERVER['PHP_SELF'], 'wp-admin/plugins.php') !== false) :
-        function ajaxcontact_warning() {
-                load_plugin_textdomain('ajaxcontact', 'wp-content/plugins/ajaxcontact/lang');
-?>
-<script type="text/javascript">//<![CDATA[
-if(!div_wraper_082net) {
-        var div_wrapers_082net = document.getElementsByTagName('DIV');
-        if(div_wrapers_082net) {
-                for(var i=0; i<div_wrapers_082net.length; i++) {
-                        if(/wrap/.exec(div_wrapers_082net[i].className)) {
-                                var div_wraper_082net = div_wrapers_082net[i];
-                                break;
-                        }
-                }
-        }
-}
-if(div_wraper_082net) {
-        var ajaxcontact_warning = document.createElement("DIV");
-        ajaxcontact_warning.innerHTML = "<p><strong><?php _e('AjaxContactForm is not active', 'ajaxcontact'); ?></strong> : <?php _e('AjaxContactForm requires <a href=\'http://082net.com/tag/wp-compatibility-pack/\'>WP-Compatibility-Pack</a> with lesser than WP 2.1', 'ajaxcontact'); ?></p>";
-        ajaxcontact_warning.className = 'updated fade';
-        ajaxcontact_warning.id = 'ajaxcontact_warning';
-        div_wraper_082net.parentNode.insertBefore(ajaxcontact_warning, div_wraper_082net);
-        Fat.fade_element('ajaxcontact_warning');
-}
-//]]></script>
-<?php
-        }
-        add_action('admin_footer', 'ajaxcontact_warning');
-        endif; // If plugin manage page.
-        return;
-}
-
 class ajaxContactForm {
-        var $version = '1.3';
+        var $version = '1.4';
         var $myhost;
         var $pluginURL;
         var $op;
         var $version_check_url = 'http://082net.com/update-check.php?check_plugin=ajaxcontact';
-        var $plugin_home = 'http://082net.com/tag/ajaxcontactform/';
+        var $plugin_home = 'http://082net.com/tag/ajaxcontactform/?orderby=modified';
 
         function ajaxContactForm() {
                 load_plugin_textdomain('ajaxcontact', 'wp-content/plugins/ajaxcontact/lang');
+                $this->init();
+        }
+
+        function init() {
                 $this->pluginURL = get_option('siteurl').'/wp-content/plugins/ajaxcontact';
                 $this->myhost = preg_replace( '|^www\.|', '', isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : $_SERVER["SERVER_NAME"]) ;
-                $this->init();
-        }
-
-        function init() {
-                $this->op = get_option('acf_options');
-                if(!$this->op)
-                        $this->activate_plugin();
-                $need_strip = array('js_lib', 'email', 'subject', 'success', 'failure');
+                $this->op = $this->get_option();
+        }
+
+        function get_option() {
+                $op = get_option('acf_options');
+                if (!$op || !is_array($op))
+                        $op = $this->default_option();
+                $op = array_merge($this->default_option(), (array)$op);
+                $need_strip = array('email', 'subject', 'success', 'failure', 'spam');
                 foreach($this->op as $k => $v) {
                         if(in_array($k, $need_strip))
                                 $this->op[$k] = stripslashes($this->op[$k]);
                 }
+                return $op;
+        }
+
+        function default_option() {
+                $default['js_lib'] = "prototype";
+                $default['email'] = get_option('admin_email');
+                $default['subject'] = "[" . get_option('blogname') . "] Message from: ";
+                $default['success'] = 'Success! Your Email has been sent. Hope you enjoyed your stay.';
+                $default['failure'] = 'Your E-mail could not be sent. Please try back at another time.';
+                $default['spam'] = __('You E-mail is defined as spam by <a href="http://akismet.com">Akismet</a>. ', 'ajaxcontact');
+                $default['checkemail'] = 1;// email address validation.
+                $default['checkdomain'] = 0;// block email address from your domain (e.g. abc@yourdomain.com). almost spam.
+                $default['contact_page_only'] = 0;
+                $default['contact_page'] = 0;
+                return $default;
         }
 
         function activate_plugin() {
                 if (!$this->op){
-                        $this->op = array();
-                        $this->op['js_lib'] = "prototype";
-                        $this->op['email'] = get_option('admin_email');
-                        $this->op['subject'] = "[" . get_option('blogname') . "] Message from: ";
-                        $this->op['success'] = 'Success! Your Email has been sent. Hope you enjoyed your stay.';
-                        $this->op['failure'] = 'Your Email could not be sent. Please try back at another time.';
-                        $this->op['checkemail'] = 1;// email address validation.
-                        $this->op['checkdomain'] = 0;// block email address from your domain (e.g. abc@yourdomain.com). almost spam.
-                        $this->op['contact_page_only'] = 0;
-                        $this->op['contact_page'] = 0;
+                        $this->op = $this->default_option();
                         update_option("acf_options", $this->op);
                 }
@@ -129 +107 @@
         }
 
-        function add_head() {
+        function wp_head() {
                 if (!$this->op['contact_page_only'] || is_page($this->op['contact_page'])) {
                         $r = "\n\t" . '<!-- Added by Ajax Contact Form -->'."\n";
@@ -137 +115 @@
         }
 
+        function akismet_available() {
+                return function_exists('akismet_http_post');
+        }
+
         function wp_scripts_available() {
+                return false;
                 $op = get_option('wp_scripts');
                 if(class_exists('wpInsertScripts') && is_array($op) && $op['baselib'] == 'mootools')
                         return true;
+                return false;
+        }
+
+        function akismet_check($check) {
+                if (!$this->akismet_available())
+                        return false;
+
+                global $akismet_api_host, $akismet_api_port;
+
+                $check['user_ip']    = preg_replace( '/[^0-9., ]/', '', $_SERVER['REMOTE_ADDR'] );
+                $check['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
+                $check['referrer']   = $_SERVER['HTTP_REFERER'];
+                $check['blog']       = get_option('home');
+
+/*              $ignore = array( 'HTTP_COOKIE' );
+
+                foreach ( $_SERVER as $key => $value )
+                        if ( !in_array( $key, $ignore ) )
+                                $comment["$key"] = $value;*/
+
+                $query_string = '';
+                foreach ( $check as $key => $data )
+                        $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+
+                $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
+                if ( 'true' == $response[1] ) {
+                        return true;
+                }
                 return false;
         }
@@ -157 +168 @@
                                 $this->op['js_lib'] = 'prototype';
                                 update_option('acf_options', $this->op);
-                                $this->enqueue_scripts();
-                        }
-                        break;
-                }
-                wp_enqueue_script('ajaxcontactform');
+                                return $this->enqueue_scripts();
+                        }
+                        break;
+                        case 'jquery' :
+                                wp_register_script('ajaxcontactform', '/wp-content/plugins/ajaxcontact/js/aj-contact-jquery.js', array('jquery', 'jquery-form'), $this->version);
+                        break;
+                }
+                $enqueue = wp_enqueue_script('ajaxcontactform');
                 endif;
         }
@@ -194 +208 @@
                         $this->op['contact_page'] = (int)$_POST['contact_page'];
                         if($this->op['checkdomain']) $this->op['checkemail'] = 1;
+                        $this->op['akismet'] = (int)$_POST['akismet_check'];
                         update_option('acf_options', $this->op);
                 } else if (isset($_POST['reset_options'])) {
@@ -211 +226 @@
 
                 <fieldset class="options">
-                        <table width="100%" cellspacing="2" cellpadding="5" class="editform" id="optiontable"> 
+                        <table width="100%" cellspacing="2" cellpadding="5" class="editform form-table" id="optiontable"> 
       <tr valign="top"> 
         <th width="20%" scope="row"><?php _e('Update Check:', 'ajaxcontact') ?></th> 
         <td>
                                 <select name="update_check">
-                                <option value="1"<?php if($op['update_check']) { ?> selected="selected"<?php } ?>>true</option>
-                                <option value="0"<?php if(!$op['update_check']) { ?> selected="selected"<?php } ?>>false</option>
+                                <option value="1"<?php selected($op['update_check'], 1); ?>>true</option>
+                                <option value="0"<?php selected($op['update_check'], 0); ?>>false</option>
                                 </select><br />
                                 <?php _e('Automatically check if plugin update is available', 'ajaxcontact'); ?></td>
                         </tr>
-<?php if($this->wp_scripts_available()) { ?>
       <tr valign="top"> 
         <th width="20%" scope="row"><?php _e('Base Javascirpt:', 'ajaxcontact') ?></th> 
         <td>
                                 <select name="js_lib">
-          <option value="mootools"<?php if ($op['js_lib'] == 'mootools') { ?> selected="selected"<?php } ?>>mootools</option>
-          <option value="prototype"<?php if ($op['js_lib'] == 'prototype') { ?> selected="selected"<?php } ?>>prototype</option>
+          <option value="jquery"<?php selected($op['js_lib'], 'jquery'); ?>>jquery</option>
+          <option value="prototype"<?php selected($op['js_lib'], 'prototype'); ?>>prototype</option>
+<?php if($this->wp_scripts_available()) { ?>
+          <option value="mootools"<?php selected($op['js_lib'], 'mootools'); ?>>mootools</option>
+<?php } ?>
          </select><br /> &mdash; 
-<?php _e('Select javascript library you want to use.', 'ajaxcontact'); ?> (<a href="http://prototype.conio.net/">prototype</a>, <a href="http://mootools.net">mootools</a>)</td> 
-      </tr>
-<?php } else { ?>
-                        <input type="hidden" name="js_lib" value="prototype" />
-<?php } ?>
+<?php _e('Select javascript library you want to use.', 'ajaxcontact'); ?> (<a href="jquery.com">jQuery</a>, <a href="http://prototype.conio.net/">prototype</a>, <a href="http://mootools.net">mootools</a>)</td> 
+      </tr>
       <tr valign="top"> 
         <th width="20%" scope="row"><?php _e('Contact Page Only:', 'ajaxcontact') ?></th> 
         <td>
                                 <select name="contact_page_only">
-                                <option value="1"<?php if($op['contact_page_only']) { ?> selected="selected"<?php } ?>>true</option>
-                                <option value="0"<?php if(!$op['contact_page_only']) { ?> selected="selected"<?php } ?>>false</option>
+                                <option value="1"<?php selected($op['contact_page_only'], 1); ?>>true</option>
+                                <option value="0"<?php selected($op['contact_page_only'], 0); ?>>false</option>
                                 </select> &mdash;
                                 <?php _e('My Contact Page:', 'ajaxcontact'); ?> <select name="contact_page">
@@ -251 +265 @@
                                 <?php _e('Set this true if you want use contact-form only on "Contact" page. And select your page', 'ajaxcontact'); ?></td>
                         </tr>
+<?php if ($this->akismet_available()) { ?>
+      <tr valign="top"> 
+        <th width="20%" scope="row"><?php _e('Akismet Check:', 'ajaxcontact') ?></th> 
+        <td>
+                                <select name="akismet_check">
+                                <option value="1"<?php selected($op['akismet'], 1); ?>>true</option>
+                                <option value="0"<?php selected($op['akismet'], 0); ?>>false</option>
+                                </select><br />
+                                <?php _e('Automatically check if mail is spam', 'ajaxcontact'); ?></td>
+                        </tr>
+<?php } ?>
       <tr valign="top"> 
         <th width="20%" scope="row"><?php _e('E-mail:', 'ajaxcontact') ?></th> 
@@ -285 +310 @@
                 </fieldset>
     <p class="submit">
-    <input style="float:left;margin-left:5%;" type="submit" name="reset_options" value="<?php _e('Reset Options', 'ajaxcontact') ?> &raquo;" />
+    <!-- <input style="float:left;margin-left:5%;" type="submit" name="reset_options" value="<?php _e('Reset Options', 'ajaxcontact') ?> &raquo;" /> -->
     <input type="submit" name="update_options" value="<?php _e('Update Options', 'ajaxcontact') ?> &raquo;" />
     </p>
@@ -294 +319 @@
 
         function print_acf() {
-                $success = (isset($_GET['acf_success']) && !empty($_GET['acf_success']))?$_GET['acf_success']:'';
+                $success = isset($_GET['acf_success']) && '' != $_GET['acf_success'] ? (int)$_GET['acf_success'] : '';
                 $result_msg = '';
-                if(!empty($success)) {
-                        switch($success) {
-                                case '0':
-                                        $result_msg .= '<div class="acf_error">';
-                                        $result_msg .= ($_GET['acf_vmail'] == '2')?'<p>check your email address.</p>':'';
-                                        $result_msg .= ($_GET['acf_vsite'] == '2')?'<p>check your website URL.</p>':'';
-                                        $result_msg .= '</div>';
-                                break;
-                                case '1':
-                                        $result_msg .= '<div class="acf_good">'.$this->op['success'].'</div>';
-                                break;
-                                case '2':
-                                        $result_msg .= '<div class="acf_error">'.$this->op['failure'].'</div>';
-                                break;
-                        }
-                }
-                $text = "\n\t" . '<div id="acf_result"'.((!empty($success))?'':' style="display:none;"').'>'.$result_msg.'</div>' . "\n";
+                switch($success) {
+                        case 0:
+                                $result_msg .= '<div class="acf_error"><p>'.__('Your E-mail could not be sent.', 'ajaxcontact').'<br />';
+                                $result_msg .= $_GET['acf_is_spam'] == 1 ? $this->op['spam'] : '';
+                                $result_msg .= $_GET['acf_vmail'] == 2 ? __('check your email address. ', 'ajaxcontact') : '';
+                                $result_msg .= $_GET['acf_vsite'] == 2 ? __('check your website URL. ', 'ajaxcontact') : '';
+                                $result_msg .= $_GET['acf_vtext'] == 0 ? __('check your message text. ', 'ajaxcontact') : '';
+                                $result_msg .= '</p></div>';
+                        break;
+                        case 1:
+                                $result_msg .= '<div class="acf_good">'.$this->op['success'].'</div>';
+                        break;
+                        case 2:
+                                $result_msg .= '<div class="acf_error">'.$this->op['failure'].'</div>';
+                        break;
+                        default:
+                        break;
+                }
+                $text = "\n\t" . '<div id="acf_result"'.('' !== $success ? '' : ' style="display:none;"').'>'.$result_msg.'</div>' . "\n";
                 $text .= "\t" . '<div><div id="acf_container">' . "\n";
                 $text .= "\t" . '<form action="'.$this->pluginURL.'/r/aj-contact.php" method="post" id="acfForm" onsubmit="acf_sendMail(); return false;">' . "\n";
@@ -392 +419 @@
 add_action('admin_menu', array(&$AjaxContact, 'add_options'));
 add_filter('the_content', array(&$AjaxContact, 'add_filter'));
-add_action('wp_head', array(&$AjaxContact, 'add_head'), 99);
-add_action('wp_print_scripts', array(&$AjaxContact, 'enqueue_scripts'));
+add_action('wp_head', array(&$AjaxContact, 'enqueue_scripts'), 0);
+add_action('wp_head', array(&$AjaxContact, 'wp_head'), 99);
 unset($AjaxContact);
 ?>

ajaxcontact/trunk/js/aj-contact-prototype.js

@@ -1 +1 @@
 function acf_sendMail() {
+        if(!$('acfForm'))
+                return;
         var url = $('acfForm').action +"?ajax=true";
         var pars = "&" + Form.serialize($('acfForm'));

ajaxcontact/trunk/lang/ajaxcontact-ko_KR.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Plural-Forms: s\n"
 "Project-Id-Version: Ajax Contact Form\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-08-20 20:15+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-06 23:17+0900\n"
+"PO-Revision-Date: 2008-08-06 23:19+0900\n"
 "Last-Translator: 082net <082net@gmail.com>\n"
 "Language-Team: 082NeT <082net@gmail.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: s\n"
 "X-Poedit-Language: Korean\n"
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
@@ -15 +16 @@
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: \n"
 
-# ajaxcontact.php:43
-msgid "AjaxContactForm is not active"
-msgstr "AjaxContactFrom이 제대로 작동하지 않습니다"
+#: ../ajaxcontact.php:77
+msgid "You E-mail is defined as spam by <a href=\"http://akismet.com\">Akismet</a>. "
+msgstr "<a href=\"http://akismet.com\">Akismet</a>에의해 스팸으로 인식되었습니다."
 
-# ajaxcontact.php:43
-msgid "AjaxContactForm requires <a href='http://082net.com/tag/wp-compatibility-pack/'>WP-Compatibility-Pack</a> with lesser than WP 2.1"
-msgstr "WP 2.1 이전 버전에서 AjaxContactForm을 사용하려면 <a href='http://082net.com/tag/wp-compatibility-pack/'>WP-Compatibility-Pack</a>을 설치하셔야만 합니다."
-
-# ajaxcontact.php:179
+#: ../ajaxcontact.php:218
 msgid "There is a plugin update available"
 msgstr "플러그인이 업데이트 되었습니다."
 
-# ajaxcontact.php:133
+#: ../ajaxcontact.php:223
 msgid "AjaxContact Options"
 msgstr "AjaxContact Options"
 
-# ajaxcontact.php:191
+#: ../ajaxcontact.php:230
 msgid "Update Check:"
 msgstr "업데이트 확인:"
 
-# ajaxcontact.php:197
+#: ../ajaxcontact.php:236
 msgid "Automatically check if plugin update is available"
 msgstr "이 페이지를 표시 할 때 마다 자동으로 업데이트를 확인합니다."
 
-# ajaxcontact.php:145
+#: ../ajaxcontact.php:239
 msgid "Base Javascirpt:"
 msgstr "기본 자바스크립트:"
 
-# ajaxcontact.php:151
+#: ../ajaxcontact.php:248
 msgid "Select javascript library you want to use."
 msgstr "사용하고자 하는 자바스크립트를 선택하세요."
 
-# ajaxcontact.php:213
+#: ../ajaxcontact.php:251
 msgid "Contact Page Only:"
 msgstr "Contact 페이지 전용:"
 
-# ajaxcontact.php:219
+#: ../ajaxcontact.php:257
 msgid "My Contact Page:"
 msgstr "내 블로그의 Contact 페이지:"
 
-# ajaxcontact.php:227
+#: ../ajaxcontact.php:265
 msgid "Set this true if you want use contact-form only on \"Contact\" page. And select your page"
 msgstr "Contact 페이지에서만 AjaxContactForm을 사용하려면 true 로 설정하신 뒤 해당 페이지를 설정하세요."
 
-# ajaxcontact.php:140
+#: ../ajaxcontact.php:269
+msgid "Akismet Check:"
+msgstr "Akismet 사용:"
+
+#: ../ajaxcontact.php:275
+msgid "Automatically check if mail is spam"
+msgstr "메일을 발송하기전에 Akismet을 이용해 스팸확인"
+
+#: ../ajaxcontact.php:279
 msgid "E-mail:"
 msgstr "이메일:"
 
-# ajaxcontact.php:142
+#: ../ajaxcontact.php:281
 msgid "(\"To\" email address(your email))"
 msgstr "( 받는메일 )"
 
-# ajaxcontact.php:145
+#: ../ajaxcontact.php:284
 msgid "Subject:"
 msgstr "제목:"
 
-# ajaxcontact.php:147
+#: ../ajaxcontact.php:286
 msgid "(Email subject)"
 msgstr "( 이메일 제목 )"
 
-# ajaxcontact.php:150
+#: ../ajaxcontact.php:289
 msgid "Success:"
 msgstr "성공:"
 
-# ajaxcontact.php:152
+#: ../ajaxcontact.php:291
 msgid "(Success message)"
 msgstr "( 발송 성공 메세지 )"
 
-# ajaxcontact.php:155
+#: ../ajaxcontact.php:294
 msgid "Error:"
 msgstr "오류:"
 
-# ajaxcontact.php:157
+#: ../ajaxcontact.php:296
 msgid "(Failure message)"
 msgstr "( 발송 오류 메세지 )"
 
-# ajaxcontact.php:170
+#: ../ajaxcontact.php:299
 msgid "Check email:"
 msgstr "메일주소 검사:"
 
-# ajaxcontact.php:172
+#: ../ajaxcontact.php:301
 msgid "If checked, it will check email address is valid"
 msgstr "(체크하시면 이메일 주소가 형식에 맞는지 검사합니다.)"
 
-# ajaxcontact.php:175
+#: ../ajaxcontact.php:304
 msgid "Check email domain:"
 msgstr "메일주소 도메인 검사:"
 
-# ajaxcontact.php:177
+#: ../ajaxcontact.php:306
 msgid "(You must make sure \"Check email\" is \"Checked\".)"
 msgstr "( 메일주소 검사 설정이 체크되어있어야 작동합니다. )"
 
-# ajaxcontact.php:178
+#: ../ajaxcontact.php:307
 msgid "(If checked, it will block email address like someone@"
 msgstr "( 체크하시면, 메일아이디@"
 
-# ajaxcontact.php:178
+#: ../ajaxcontact.php:307
 msgid " - almost SPAM)"
 msgstr " 와 같은 메일주소를 거부하게됩니다 - 대부분이 스팸 )"
 
-# ajaxcontact.php:183
+#: ../ajaxcontact.php:312
 msgid "Reset Options"
 msgstr "설정 초기화"
 
-# ajaxcontact.php:184
+#: ../ajaxcontact.php:313
 msgid "Update Options"
 msgstr "설정 업데이트"
 
-# ajaxcontact.php:196
+#: ../ajaxcontact.php:325
+msgid "Your E-mail could not be sent."
+msgstr "이메일을 발송 할 수 없습니다."
+
+#: ../ajaxcontact.php:327
+msgid "check your email address. "
+msgstr "이메일 주소를 확인하세요."
+
+#: ../ajaxcontact.php:328
+msgid "check your website URL. "
+msgstr "누리집주소를 확인하세요"
+
+#: ../ajaxcontact.php:329
+msgid "check your message text. "
+msgstr "메일 내용을 확인하세요."
+
+#: ../ajaxcontact.php:346
 msgid "Name (required):"
 msgstr "이름 (필수):"
 
-# ajaxcontact.php:198
+#: ../ajaxcontact.php:348
 msgid "Email (required):"
 msgstr "전자우편 (필수):"
 
-# ajaxcontact.php:200
+#: ../ajaxcontact.php:350
 msgid "Website:"
 msgstr "누리집 주소:"
 
-# ajaxcontact.php:196
+#: ../ajaxcontact.php:352
 msgid "Message (required):"
 msgstr "내용 (필수):"
 
+#~ msgid "You E-mail is defined as spam. "
+#~ msgstr "발송하려는 메일이 스팸인것으로 보입니다."
+

ajaxcontact/trunk/r/aj-contact.php

@@ -1 @@
-<?php require_once('../../../../wp-config.php');
+<?php 
+$wp_root = preg_replace( '|wp-content/plugins.*$|','', str_replace('\\', '/', __FILE__) );
+if (is_file($wp_root . 'wp-load.php')) {
+        require_once($wp_root . 'wp-load.php');
+} else {
+        require_once($wp_root . 'wp-config.php');
+}
 if(!class_exists('ajaxContactForm')) die('There is no AjaxContactForm plugin');
 header('Content-Type: text/html; charset: '.get_option('blog_charset').'');
@@ -6 +12 @@
 // call instance of plugin
 $AjaxContact =& ajaxContactForm::get_instance();
-
+$use_mail = $wp_version < '2.2';// Wordpress, greater than 2.2 has the ability to encode mail headers to utf-8
 $pname = stripslashes(trim($_POST['acfName']));
 $pemail = stripslashes(trim($_POST['acfEmail']));
@@ -12 +18 @@
 $text = stripslashes($_POST['acfText']);
 $ip = $_SERVER["REMOTE_ADDR"];
-$pfrom = '=?utf-8?b?'.base64_encode($pname).'?=';
+$pfrom = $use_mail ? '=?utf-8?b?'.base64_encode($pname).'?=' : $pname;
 $redirect_to = stripslashes($_POST['acfRedirect']);
-$success = '0';
-$valid_mail = '0';
-$valid_site = '0';
-?>
-<?php
-if ($AjaxContact->check_email($pemail) && $AjaxContact->check_site($psite)) {
-        $valid_mail = '1';
-        $valid_site = '1';
-        $to = $AjaxContact->op['email'];
-        $subject = $AjaxContact->op['subject'] . $pname;
-        $message = $pname .' wrote:'."\n";
-        $message .= wordwrap($text, 64, "\n") . "\n\n";
-        $message .= "Website: " . $psite . "\n";
-        $message .= "IP: " . $ip . " (host: ".gethostbyaddr($ip).")";
-        $headers = "MIME-Version: 1.0\n" .
-        $headers .= "From: ".$pfrom." <".$pemail.">". "\n" . 
-        $headers .= "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+$success = 0;