Contact Form by BestWebSoft - Version 3.81

Version Description

  • 17.07.2014 =
  • Update : We updated all functionality for Email Queue plugin.
Download this release

Release Info

Developer bestwebsoft
Plugin Icon 128x128 Contact Form by BestWebSoft
Version 3.81
Comparing to
See all releases

Code changes from version 3.80 to 3.81

Files changed (5) hide show
  1. bws_menu/bws_menu.php +11 -3
  2. bws_menu/css/style.css +1 -0
  3. bws_menu/icons/email-queue.png +0 -0
  4. contact_form.php +119 -90
  5. readme.txt +8 -1
bws_menu/bws_menu.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /*
3
  * Function for displaying BestWebSoft menu
4
- * Version: 1.3.3
5
  */
6
 
7
  if ( ! function_exists( 'bws_add_menu_render' ) ) {
@@ -119,7 +119,7 @@ if ( ! function_exists( 'bws_add_menu_render' ) ) {
119
  ),
120
  'google-one/google-plus-one.php' => array(
121
  'name' => 'Google +1',
122
- 'description' => 'Allows you to celebrate liked the article.',
123
  'link' => 'http://bestwebsoft.com/plugin/google-plus-one/?k=ce7a88837f0a857b3a2bb142f470853c&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version,
124
  'download' => 'http://bestwebsoft.com/plugin/google-plus-one/?k=ce7a88837f0a857b3a2bb142f470853c&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version . '#download',
125
  'wp_install' => '/wp-admin/plugin-install.php?tab=search&type=term&s=Google+%2B1+bestwebsoft&plugin-search-input=Search+Plugins',
@@ -251,6 +251,14 @@ if ( ! function_exists( 'bws_add_menu_render' ) ) {
251
  'wp_install' => '/wp-admin/plugin-install.php?tab=search&s=User+Role+BestWebSoft&plugin-search-input=Search+Plugins',
252
  'settings' => 'admin.php?page=user-role.php',
253
  'pro_version' => 'user-role-pro/user-role-pro.php'
 
 
 
 
 
 
 
 
254
  )
255
  );
256
  $bws_plugins_pro = array(
@@ -305,7 +313,7 @@ if ( ! function_exists( 'bws_add_menu_render' ) ) {
305
  ),
306
  'google-one-pro/google-plus-one-pro.php' => array(
307
  'name' => 'Google +1 Pro',
308
- 'description' => 'Allows you to celebrate liked the article.',
309
  'link' => 'http://bestwebsoft.com/plugin/google-plus-one-pro/?k=f4b0a62d155c9df9601a0531ad5bd832&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version,
310
  'purchase' => 'http://bestwebsoft.com/plugin/google-plus-one-pro?k=f4b0a62d155c9df9601a0531ad5bd832&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version . '#purchase',
311
  'settings' => 'admin.php?page=google-plus-one-pro.php'
1
  <?php
2
  /*
3
  * Function for displaying BestWebSoft menu
4
+ * Version: 1.3.4
5
  */
6
 
7
  if ( ! function_exists( 'bws_add_menu_render' ) ) {
119
  ),
120
  'google-one/google-plus-one.php' => array(
121
  'name' => 'Google +1',
122
+ 'description' => 'Allows you to see how many times your page has been liked on Google Search Engine as well as who has liked the article.',
123
  'link' => 'http://bestwebsoft.com/plugin/google-plus-one/?k=ce7a88837f0a857b3a2bb142f470853c&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version,
124
  'download' => 'http://bestwebsoft.com/plugin/google-plus-one/?k=ce7a88837f0a857b3a2bb142f470853c&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version . '#download',
125
  'wp_install' => '/wp-admin/plugin-install.php?tab=search&type=term&s=Google+%2B1+bestwebsoft&plugin-search-input=Search+Plugins',
251
  'wp_install' => '/wp-admin/plugin-install.php?tab=search&s=User+Role+BestWebSoft&plugin-search-input=Search+Plugins',
252
  'settings' => 'admin.php?page=user-role.php',
253
  'pro_version' => 'user-role-pro/user-role-pro.php'
254
+ ),
255
+ 'email-queue/email-queue.php' => array(
256
+ 'name' => 'Email Queue',
257
+ 'description' => 'Allows to manage email massages sent by BestWebSoft plugins.',
258
+ 'link' => 'http://bestwebsoft.com/plugin/email-queue/?k=e345e1b6623f0dca119bc2d9433b130b&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version,
259
+ 'download' => 'http://bestwebsoft.com/plugin/email-queue/?k=e345e1b6623f0dca119bc2d9433b130b&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version . '#download',
260
+ 'wp_install' => '/wp-admin/plugin-install.php?tab=search&s=Email+Queue+BestWebSoft&plugin-search-input=Search+Plugins',
261
+ 'settings' => 'admin.php?page=mlq_settings'
262
  )
263
  );
264
  $bws_plugins_pro = array(
313
  ),
314
  'google-one-pro/google-plus-one-pro.php' => array(
315
  'name' => 'Google +1 Pro',
316
+ 'description' => 'Allows you to see how many times your page has been liked on Google Search Engine as well as who has liked the article.',
317
  'link' => 'http://bestwebsoft.com/plugin/google-plus-one-pro/?k=f4b0a62d155c9df9601a0531ad5bd832&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version,
318
  'purchase' => 'http://bestwebsoft.com/plugin/google-plus-one-pro?k=f4b0a62d155c9df9601a0531ad5bd832&pn=' . $bws_plugin_info["id"] . '&v=' . $bws_plugin_info["version"] . '&wp_v=' . $wp_version . '#purchase',
319
  'settings' => 'admin.php?page=google-plus-one-pro.php'
bws_menu/css/style.css CHANGED
@@ -95,6 +95,7 @@ h4.bws_installed:before {
95
  margin: -9px auto -10px;
96
  position: relative;
97
  width: 46px;
 
98
  }
99
  .bws_product_description {
100
  padding: 0 10px;
95
  margin: -9px auto -10px;
96
  position: relative;
97
  width: 46px;
98
+ line-height: 19px;
99
  }
100
  .bws_product_description {
101
  padding: 0 10px;
bws_menu/icons/email-queue.png ADDED
Binary file
contact_form.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Contact Form
4
  Plugin URI: http://bestwebsoft.com/plugin/
5
  Description: Plugin for Contact Form.
6
  Author: BestWebSoft
7
- Version: 3.80
8
  Author URI: http://bestwebsoft.com/
9
  License: GPLv2 or later
10
  */
@@ -2182,120 +2182,149 @@ if( ! function_exists( 'cntctfrm_send_mail' ) ) {
2182
  }
2183
 
2184
  do_action( 'cntctfrm_get_mail_data', $to, $name, $email, $address, $phone, $subject, $message, $form_action_url, $user_agent, $userdomain );
2185
-
2186
- if ( 'wp-mail' == $cntctfrm_options['cntctfrm_mail_method'] ) {
2187
- /* To send HTML mail, the Content-type header must be set */
2188
- if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2189
- $headers .= 'Content-type: text/html; charset=utf-8' . "\n";
2190
- else
2191
- $headers .= 'Content-type: text/plain; charset=utf-8' . "\n";
2192
 
2193
- /* Additional headers */
2194
- if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2195
- $headers .= 'From: ' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '';
2196
- else
2197
- $headers .= 'From: ' . $email . '';
2198
 
 
 
2199
  if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) {
2200
- $path_parts = pathinfo( $path_of_uploaded_file );
2201
- $path_of_uploaded_file_changed = $path_parts['dirname'] . '/' . preg_replace( '/^cntctfrm_[A-Z,a-z,0-9]{32}_/i', '', $path_parts['basename'] );
2202
-
2203
- if ( ! @copy( $path_of_uploaded_file, $path_of_uploaded_file_changed ) )
2204
- $path_of_uploaded_file_changed = $path_of_uploaded_file;
2205
-
2206
- $attachments = array( $path_of_uploaded_file_changed );
2207
  }
2208
-
2209
- if ( isset( $_POST['cntctfrm_contact_send_copy'] ) && 1 == $_POST['cntctfrm_contact_send_copy'] )
2210
- wp_mail( $email, $subject, $message_text_for_user, $headers, $attachments );
2211
-
2212
- /* Mail it */
2213
- $mail_result = wp_mail( $to, $subject, $message_text, $headers, $attachments );
2214
- /* Delete attachment */
2215
- if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"]
2216
- && $path_of_uploaded_file_changed != $path_of_uploaded_file ) {
2217
- @unlink( $path_of_uploaded_file_changed );
2218
- }
2219
- if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] && '1' == $cntctfrm_options['cntctfrm_delete_attached_file'] ) {
2220
- @unlink( $path_of_uploaded_file );
2221
  }
2222
- return $mail_result;
 
 
 
2223
  } else {
2224
- // Set headers
2225
- $headers .= 'MIME-Version: 1.0' . "\n";
2226
-
2227
- if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) {
2228
- $message_block = $message_text;
2229
-
2230
- if ( 'custom' == $cntctfrm_options['cntctfrm_select_from_field'] )
2231
- $from_field_name = stripslashes( $cntctfrm_options['cntctfrm_from_field'] );
2232
  else
2233
- $from_field_name = $name;
2234
 
2235
  /* Additional headers */
2236
  if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2237
- $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '>' . "\n";
2238
  else
2239
- $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $email ) . '>' . "\n";
2240
 
 
 
 
2241
 
2242
- $bound_text = "jimmyP123";
2243
-
2244
- $bound = "--" . $bound_text . "";
2245
 
2246
- $bound_last = "--" . $bound_text . "--";
 
2247
 
2248
- $headers .= "Content-Type: multipart/mixed; boundary=\"$bound_text\"";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2249
 
2250
- $message_text = __( "If you can see this MIME, it means that the MIME type is not supported by your email client!", "contact_form" ) . "\n";
 
2251
 
2252
- if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2253
- $message_text .= $bound . "\n" . "Content-Type: text/html; charset=\"utf-8\"\n" . "Content-Transfer-Encoding: 7bit\n\n" . $message_block . "\n\n";
2254
- else
2255
- $message_text .= $bound . "\n" . "Content-Type: text/plain; charset=\"utf-8\"\n" . "Content-Transfer-Encoding: 7bit\n\n" . $message_block . "\n\n";
2256
-
2257
-
2258
- $file = file_get_contents( $path_of_uploaded_file );
2259
- $message_text .= $bound . "\n";
2260
-
2261
- $message_text .= "Content-Type: application/octet-stream; name=\"" . $_FILES["cntctfrm_contact_attachment"]["name"] . "\"\n" .
2262
- "Content-Description: " . basename( $path_of_uploaded_file ) . "\n" .
2263
- "Content-Disposition: attachment;\n" . " filename=\"" . $_FILES["cntctfrm_contact_attachment"]["name"] ."\"; size=" . filesize( $path_of_uploaded_file ) . ";\n" .
2264
- "Content-Transfer-Encoding: base64\n\n" . chunk_split( base64_encode( $file ) ) . "\n\n";
2265
- $message_text .= $bound_last;
2266
- } else {
2267
- /* To send HTML mail, header must be set */
2268
- if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2269
- $headers .= 'Content-type: text/html; charset=utf-8' . "\n";
2270
- else
2271
- $headers .= 'Content-type: text/plain; charset=utf-8' . "\n";
2272
 
2273
- if ( 'custom' == $cntctfrm_options['cntctfrm_select_from_field'] )
2274
- $from_field_name = stripslashes( $cntctfrm_options['cntctfrm_from_field'] );
2275
- else
2276
- $from_field_name = $name;
 
2277
 
2278
- /* Additional headers */
2279
- if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2280
- $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '>' . "\n";
2281
- else
2282
- $headers .= 'From: ' . $from_field_name . ' <' . $email . '>' . "\n";
2283
- }
2284
- if ( isset( $_POST['cntctfrm_contact_send_copy'] ) && 1 == $_POST['cntctfrm_contact_send_copy'] )
2285
- @mail( $email, $subject, $message_text_for_user, $headers );
2286
 
2287
- $mail_result = @mail( $to, $subject , $message_text, $headers );
2288
- /* Delete attachment */
2289
- if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] && '1' == $cntctfrm_options['cntctfrm_delete_attached_file'] ) {
2290
- @unlink( $path_of_uploaded_file );
2291
- }
2292
- return $mail_result;
2293
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2294
  }
2295
  return false;
2296
  }
2297
  }
2298
 
 
 
 
 
 
 
 
 
 
 
2299
  if ( ! function_exists ( 'cntctfrm_plugin_action_links' ) ) {
2300
  function cntctfrm_plugin_action_links( $links, $file ) {
2301
  /* Static so we don't call plugin_basename on every plugin row. */
4
  Plugin URI: http://bestwebsoft.com/plugin/
5
  Description: Plugin for Contact Form.
6
  Author: BestWebSoft
7
+ Version: 3.81
8
  Author URI: http://bestwebsoft.com/
9
  License: GPLv2 or later
10
  */
2182
  }
2183
 
2184
  do_action( 'cntctfrm_get_mail_data', $to, $name, $email, $address, $phone, $subject, $message, $form_action_url, $user_agent, $userdomain );
 
 
 
 
 
 
 
2185
 
2186
+ if ( ! function_exists( 'is_plugin_active' ) )
2187
+ require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 
 
 
2188
 
2189
+ if ( is_plugin_active( 'email-queue/email-queue.php' ) && mlq_if_mail_plugin_is_in_queue( plugin_basename( __FILE__ ) ) ) {
2190
+ /* if email-queue plugin is active and this plugin's "in_queue" status is 'ON' */
2191
  if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) {
2192
+ $attachment_file = $path_of_uploaded_file;
2193
+ } else {
2194
+ $attachment_file = '';
 
 
 
 
2195
  }
2196
+ if ( isset( $_POST['cntctfrm_contact_send_copy'] ) && 1 == $_POST['cntctfrm_contact_send_copy'] ) {
2197
+ do_action( 'cntctfrm_get_mail_data_for_mlq', plugin_basename( __FILE__ ), $email, $subject, $message_text_for_user, $attachment_file );
 
 
 
 
 
 
 
 
 
 
 
2198
  }
2199
+ global $mlq_mail_result;
2200
+ do_action( 'cntctfrm_get_mail_data_for_mlq', plugin_basename( __FILE__ ), $to, $subject, $message_text, $attachment_file );
2201
+ /* return $mail_result = true if email-queue has successfully inserted mail in its DB; in other case - return false */
2202
+ return $mail_result = $mlq_mail_result;
2203
  } else {
2204
+ if ( 'wp-mail' == $cntctfrm_options['cntctfrm_mail_method'] ) {
2205
+ /* To send HTML mail, the Content-type header must be set */
2206
+ if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2207
+ $headers .= 'Content-type: text/html; charset=utf-8' . "\n";
 
 
 
 
2208
  else
2209
+ $headers .= 'Content-type: text/plain; charset=utf-8' . "\n";
2210
 
2211
  /* Additional headers */
2212
  if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2213
+ $headers .= 'From: ' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '';
2214
  else
2215
+ $headers .= 'From: ' . $email . '';
2216
 
2217
+ if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) {
2218
+ $path_parts = pathinfo( $path_of_uploaded_file );
2219
+ $path_of_uploaded_file_changed = $path_parts['dirname'] . '/' . preg_replace( '/^cntctfrm_[A-Z,a-z,0-9]{32}_/i', '', $path_parts['basename'] );
2220
 
2221
+ if ( ! @copy( $path_of_uploaded_file, $path_of_uploaded_file_changed ) )
2222
+ $path_of_uploaded_file_changed = $path_of_uploaded_file;
 
2223
 
2224
+ $attachments = array( $path_of_uploaded_file_changed );
2225
+ }
2226
 
2227
+ if ( isset( $_POST['cntctfrm_contact_send_copy'] ) && 1 == $_POST['cntctfrm_contact_send_copy'] )
2228
+ wp_mail( $email, $subject, $message_text_for_user, $headers, $attachments );
2229
+
2230
+ /* Mail it */
2231
+ $mail_result = wp_mail( $to, $subject, $message_text, $headers, $attachments );
2232
+ /* Delete attachment */
2233
+ if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"]
2234
+ && $path_of_uploaded_file_changed != $path_of_uploaded_file ) {
2235
+ @unlink( $path_of_uploaded_file_changed );
2236
+ }
2237
+ if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] && '1' == $cntctfrm_options['cntctfrm_delete_attached_file'] ) {
2238
+ @unlink( $path_of_uploaded_file );
2239
+ }
2240
+ return $mail_result;
2241
+ } else {
2242
+ // Set headers
2243
+ $headers .= 'MIME-Version: 1.0' . "\n";
2244
 
2245
+ if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) {
2246
+ $message_block = $message_text;
2247
 
2248
+ if ( 'custom' == $cntctfrm_options['cntctfrm_select_from_field'] )
2249
+ $from_field_name = stripslashes( $cntctfrm_options['cntctfrm_from_field'] );
2250
+ else
2251
+ $from_field_name = $name;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2252
 
2253
+ /* Additional headers */
2254
+ if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2255
+ $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '>' . "\n";
2256
+ else
2257
+ $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $email ) . '>' . "\n";
2258
 
 
 
 
 
 
 
 
 
2259
 
2260
+ $bound_text = "jimmyP123";
2261
+
2262
+ $bound = "--" . $bound_text . "";
2263
+
2264
+ $bound_last = "--" . $bound_text . "--";
2265
+
2266
+ $headers .= "Content-Type: multipart/mixed; boundary=\"$bound_text\"";
2267
+
2268
+ $message_text = __( "If you can see this MIME, it means that the MIME type is not supported by your email client!", "contact_form" ) . "\n";
2269
+
2270
+ if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2271
+ $message_text .= $bound . "\n" . "Content-Type: text/html; charset=\"utf-8\"\n" . "Content-Transfer-Encoding: 7bit\n\n" . $message_block . "\n\n";
2272
+ else
2273
+ $message_text .= $bound . "\n" . "Content-Type: text/plain; charset=\"utf-8\"\n" . "Content-Transfer-Encoding: 7bit\n\n" . $message_block . "\n\n";
2274
+
2275
+
2276
+ $file = file_get_contents( $path_of_uploaded_file );
2277
+ $message_text .= $bound . "\n";
2278
+
2279
+ $message_text .= "Content-Type: application/octet-stream; name=\"" . $_FILES["cntctfrm_contact_attachment"]["name"] . "\"\n" .
2280
+ "Content-Description: " . basename( $path_of_uploaded_file ) . "\n" .
2281
+ "Content-Disposition: attachment;\n" . " filename=\"" . $_FILES["cntctfrm_contact_attachment"]["name"] ."\"; size=" . filesize( $path_of_uploaded_file ) . ";\n" .
2282
+ "Content-Transfer-Encoding: base64\n\n" . chunk_split( base64_encode( $file ) ) . "\n\n";
2283
+ $message_text .= $bound_last;
2284
+ } else {
2285
+ /* To send HTML mail, header must be set */
2286
+ if ( 1 == $cntctfrm_options['cntctfrm_html_email'] )
2287
+ $headers .= 'Content-type: text/html; charset=utf-8' . "\n";
2288
+ else
2289
+ $headers .= 'Content-type: text/plain; charset=utf-8' . "\n";
2290
+
2291
+ if ( 'custom' == $cntctfrm_options['cntctfrm_select_from_field'] )
2292
+ $from_field_name = stripslashes( $cntctfrm_options['cntctfrm_from_field'] );
2293
+ else
2294
+ $from_field_name = $name;
2295
+
2296
+ /* Additional headers */
2297
+ if ( 'custom' == $cntctfrm_options['cntctfrm_from_email'] )
2298
+ $headers .= 'From: ' . $from_field_name . ' <' . stripslashes( $cntctfrm_options['cntctfrm_custom_from_email'] ) . '>' . "\n";
2299
+ else
2300
+ $headers .= 'From: ' . $from_field_name . ' <' . $email . '>' . "\n";
2301
+ }
2302
+ if ( isset( $_POST['cntctfrm_contact_send_copy'] ) && 1 == $_POST['cntctfrm_contact_send_copy'] )
2303
+ @mail( $email, $subject, $message_text_for_user, $headers );
2304
+
2305
+ $mail_result = @mail( $to, $subject , $message_text, $headers );
2306
+ /* Delete attachment */
2307
+ if ( 1 == $cntctfrm_options['cntctfrm_attachment'] && isset( $_FILES["cntctfrm_contact_attachment"]["tmp_name"] ) && "" != $_FILES["cntctfrm_contact_attachment"]["tmp_name"] && '1' == $cntctfrm_options['cntctfrm_delete_attached_file'] ) {
2308
+ @unlink( $path_of_uploaded_file );
2309
+ }
2310
+ return $mail_result;
2311
+ }
2312
+ }
2313
  }
2314
  return false;
2315
  }
2316
  }
2317
 
2318
+ /**
2319
+ * Function that is used by email-queue to check for compatibility
2320
+ * @return void
2321
+ */
2322
+ if ( ! function_exists( 'cntctfrm_check_for_compatibility_with_mlq' ) ) {
2323
+ function cntctfrm_check_for_compatibility_with_mlq() {
2324
+ return false;
2325
+ }
2326
+ }
2327
+
2328
  if ( ! function_exists ( 'cntctfrm_plugin_action_links' ) ) {
2329
  function cntctfrm_plugin_action_links( $links, $file ) {
2330
  /* Static so we don't call plugin_basename on every plugin row. */
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.2checkout.com/checkout/purchase?sid=1430388&quantity=1&
4
  Tags: attachment, contact, contatc, conact, cnotact, contact button, contact form, contact form plugin, contact me, contacts, contacts form plugin, copy, feedback, feedback form, form, insert the shortcode, post feedback, request, send, send copy, send messages, shortcode, text, web-page feedback
5
  Requires at least: 3.1
6
  Tested up to: 3.9.1
7
- Stable tag: 3.80
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -44,6 +44,7 @@ There is also a premium version of the plugin <a href="http://bestwebsoft.com/pl
44
  There is also a premium version of the plugin <a href="http://bestwebsoft.com/plugin/contact-form-to-db-pro/?k=d7d962591b5be0ce6c27af778b1b36ee">Contact Form To DB Pro</a>, allowing to re-send and preiodically delete messages, manage attachments and get detailed support and answers to your questions.
45
  * <a href="http://wordpress.org/plugins/contact-form-multi/">Contact Form Multi</a> - This plugin makes it possible to create and implement multiple contact forms on your site. It is also possible to set different parameters for different contact forms. Please note that this plugin is an exclusive add-on ONLY for Contact Form plugin by BestWebSoft and it will not work wothout it. Please make sure you've enabled Javascript, otherwise the plugin will not work.
46
  There is also a premium version of the plugin <a href="http://bestwebsoft.com/plugin/contact-form-multi-pro/?k=34543c152eff369d529e9b4da85985a9">Contact Form Multi Pro</a>, compatible with Contact Form Pro (ability to select different extra settings for each contact form).
 
47
 
48
  = Translation =
49
 
@@ -156,6 +157,9 @@ Please make sure that the problem hasn't been discussed yet on our forum (<a hre
156
 
157
  == Changelog ==
158
 
 
 
 
159
  = V3.80 - 08.07.2014 =
160
  * Bugfix : The bug related to overwriting of the attachments with the same names was fixed.
161
  * NEW : We added ability to use the changed names of the fields of the contact form in the sent letter.
@@ -515,6 +519,9 @@ Please make sure that the problem hasn't been discussed yet on our forum (<a hre
515
 
516
  == Upgrade Notice ==
517
 
 
 
 
518
  = V3.80 =
519
  The bug related to overwriting of the attachments with the same names was fixed.
520
  We added ability to use the changed names of the fields of the contact form in the sent letter.
4
  Tags: attachment, contact, contatc, conact, cnotact, contact button, contact form, contact form plugin, contact me, contacts, contacts form plugin, copy, feedback, feedback form, form, insert the shortcode, post feedback, request, send, send copy, send messages, shortcode, text, web-page feedback
5
  Requires at least: 3.1
6
  Tested up to: 3.9.1
7
+ Stable tag: 3.81
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
44
  There is also a premium version of the plugin <a href="http://bestwebsoft.com/plugin/contact-form-to-db-pro/?k=d7d962591b5be0ce6c27af778b1b36ee">Contact Form To DB Pro</a>, allowing to re-send and preiodically delete messages, manage attachments and get detailed support and answers to your questions.
45
  * <a href="http://wordpress.org/plugins/contact-form-multi/">Contact Form Multi</a> - This plugin makes it possible to create and implement multiple contact forms on your site. It is also possible to set different parameters for different contact forms. Please note that this plugin is an exclusive add-on ONLY for Contact Form plugin by BestWebSoft and it will not work wothout it. Please make sure you've enabled Javascript, otherwise the plugin will not work.
46
  There is also a premium version of the plugin <a href="http://bestwebsoft.com/plugin/contact-form-multi-pro/?k=34543c152eff369d529e9b4da85985a9">Contact Form Multi Pro</a>, compatible with Contact Form Pro (ability to select different extra settings for each contact form).
47
+ * <a href="http://wordpress.org/plugins/email-queue/">Email Queue</a> - This plugin gives you an opportunity to organize a simple and effective mail queue. You can assign priorities to plugins that send mail. You can manage outgoing messages: trash them or delete completely. You can use searching, filtering and bulk operations with your mail. The plugin works with plugins produced by BestWebSoft team only.
48
 
49
  = Translation =
50
 
157
 
158
  == Changelog ==
159
 
160
+ = V3.81 - 17.07.2014 =
161
+ * Update : We updated all functionality for Email Queue plugin.
162
+
163
  = V3.80 - 08.07.2014 =
164
  * Bugfix : The bug related to overwriting of the attachments with the same names was fixed.
165
  * NEW : We added ability to use the changed names of the fields of the contact form in the sent letter.
519
 
520
  == Upgrade Notice ==
521
 
522
+ = V3.81 =
523
+ We updated all functionality for Email Queue plugin.
524
+
525
  = V3.80 =
526
  The bug related to overwriting of the attachments with the same names was fixed.
527
  We added ability to use the changed names of the fields of the contact form in the sent letter.