-
-
-
-
-
-
+
+
+
' . trim( $tinkle, "\n" ) . "
\n"; - $pee = preg_replace( '|\s*
|', '', $pee ); // under certain strange conditions it could create a P of entirely whitespace - $pee = preg_replace( '!([^<]+)!', "
$1
", $pee ); - $pee = preg_replace( '!\s*(]*>)\s*
!', "$1", $pee ); // don't pee all over a tag - $pee = preg_replace( "|( ", $pee );
- $pee = str_replace( ' \s*(]*>)!', "$1", $pee );
- $pee = preg_replace( '!(]*>)\s*
\n", $pee ); // optionally make line breaks
- $pee = str_replace( '
!', "$1", $pee );
- $pee = preg_replace( '!
(\s*]*>)!', '$1', $pee );
- if ( strpos( $pee, '
\s*?(' . wpcf7_get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee );
-
- return $pee;
-}
-
-function wpcf7_strip_quote( $text ) {
- $text = trim( $text );
- if ( preg_match( '/^"(.*)"$/', $text, $matches ) )
- $text = $matches[1];
- elseif ( preg_match( "/^'(.*)'$/", $text, $matches ) )
- $text = $matches[1];
- return $text;
-}
-
-function wpcf7_strip_quote_deep( $arr ) {
- if ( is_string( $arr ) )
- return wpcf7_strip_quote( $arr );
-
- if ( is_array( $arr ) ) {
- $result = array();
- foreach ( $arr as $key => $text ) {
- $result[$key] = wpcf7_strip_quote( $text );
- }
- return $result;
- }
-}
-
-function wpcf7_canonicalize( $text ) {
- if ( function_exists( 'mb_convert_kana' ) && 'UTF-8' == get_option( 'blog_charset' ) )
- $text = mb_convert_kana( $text, 'asKV', 'UTF-8' );
-
- $text = strtolower( $text );
- $text = trim( $text );
- return $text;
-}
-
+\s* ' . trim( $tinkle, "\n" ) . " \s* ([^<]+)!', " $1 \s*(]*>)\s* ( ", $pee );
+ $pee = str_replace( ' \s*(]*>)!', "$1", $pee );
+ $pee = preg_replace( '!(]*>)\s*
|', "\n\n", $pee );
+ // Space things out a little
+ /* wpcf7: removed select and input */
+ $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr)';
+ $pee = preg_replace( '!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee );
+ $pee = preg_replace( '!()!', "$1\n\n", $pee );
+ $pee = str_replace( array( "\r\n", "\r" ), "\n", $pee ); // cross-platform newlines
+ if ( strpos( $pee, '
\n", $pee ); // optionally make line breaks
+ $pee = str_replace( '
!', "$1", $pee );
+ $pee = preg_replace( '!
(\s*]*>)!', '$1', $pee );
+ if ( strpos( $pee, '
\s*?(' . wpcf7_get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee );
+
+ return $pee;
+}
+
+function wpcf7_strip_quote( $text ) {
+ $text = trim( $text );
+ if ( preg_match( '/^"(.*)"$/', $text, $matches ) )
+ $text = $matches[1];
+ elseif ( preg_match( "/^'(.*)'$/", $text, $matches ) )
+ $text = $matches[1];
+ return $text;
+}
+
+function wpcf7_strip_quote_deep( $arr ) {
+ if ( is_string( $arr ) )
+ return wpcf7_strip_quote( $arr );
+
+ if ( is_array( $arr ) ) {
+ $result = array();
+ foreach ( $arr as $key => $text ) {
+ $result[$key] = wpcf7_strip_quote( $text );
+ }
+ return $result;
+ }
+}
+
+function wpcf7_canonicalize( $text ) {
+ if ( function_exists( 'mb_convert_kana' ) && 'UTF-8' == get_option( 'blog_charset' ) )
+ $text = mb_convert_kana( $text, 'asKV', 'UTF-8' );
+
+ $text = strtolower( $text );
+ $text = trim( $text );
+ return $text;
+}
+
?>
\ No newline at end of file
diff --git a/includes/functions.php b/includes/functions.php
index c102e5d..8384a32 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,173 +1,173 @@
-' . __( 'Your Name', 'wpcf7' ) . ' ' . __( '(required)', 'wpcf7' ) . '
' . "\n";
- $template .= ' [text* your-name]
' . __( 'Your Email', 'wpcf7' ) . ' ' . __( '(required)', 'wpcf7' ) . '
' . "\n";
- $template .= ' [email* your-email]
' . __( 'Subject', 'wpcf7' ) . '
' . "\n";
- $template .= ' [text your-subject]
' . __( 'Your Message', 'wpcf7' ) . '
' . "\n";
- $template .= ' [textarea your-message]
[submit "' . __( 'Send', 'wpcf7' ) . '"]
'; - return $template; -} - -function wpcf7_default_mail_template() { - $subject = '[your-subject]'; - $sender = '[your-name] <[your-email]>'; - $body = '[your-message]'; - $recipient = get_option( 'admin_email' ); - return compact( 'subject', 'sender', 'body', 'recipient' ); -} - -function wpcf7_default_mail_2_template() { - $active = false; - $subject = '[your-subject]'; - $sender = '[your-name] <[your-email]>'; - $body = '[your-message]'; - $recipient = '[your-email]'; - return compact( 'active', 'subject', 'sender', 'body', 'recipient' ); -} - -function wpcf7_default_messages_template() { - $mail_sent_ok = wpcf7_default_message( 'mail_sent_ok' ); - $mail_sent_ng = wpcf7_default_message( 'mail_sent_ng' ); - $akismet_says_spam = wpcf7_default_message( 'akismet_says_spam' ); - $validation_error = wpcf7_default_message( 'validation_error' ); - $accept_terms = wpcf7_default_message( 'accept_terms' ); - $invalid_email = wpcf7_default_message( 'invalid_email' ); - $invalid_required = wpcf7_default_message( 'invalid_required' ); - $quiz_answer_not_correct = wpcf7_default_message( 'quiz_answer_not_correct' ); - $captcha_not_match = wpcf7_default_message( 'captcha_not_match' ); - $upload_failed = wpcf7_default_message( 'upload_failed' ); - $upload_file_type_invalid = wpcf7_default_message( 'upload_file_type_invalid' ); - $upload_file_too_large = wpcf7_default_message( 'upload_file_too_large' ); - - return compact( 'mail_sent_ok', 'mail_sent_ng', 'akismet_says_spam', - 'validation_error', 'accept_terms', 'invalid_email', 'invalid_required', 'quiz_answer_not_correct', - 'captcha_not_match', 'upload_failed', 'upload_file_type_invalid', 'upload_file_too_large' ); -} - -function wpcf7_upload_dir( $type = false ) { - $siteurl = get_option( 'siteurl' ); - $upload_path = trim( get_option( 'upload_path' ) ); - if ( empty( $upload_path ) ) - $dir = WP_CONTENT_DIR . '/uploads'; - else - $dir = $upload_path; - - $dir = path_join( ABSPATH, $dir ); - - if ( ! $url = get_option( 'upload_url_path' ) ) { - if ( empty( $upload_path ) || $upload_path == $dir ) - $url = WP_CONTENT_URL . '/uploads'; - else - $url = trailingslashit( $siteurl ) . $upload_path; - } - - if ( defined( 'UPLOADS' ) ) { - $dir = ABSPATH . UPLOADS; - $url = trailingslashit( $siteurl ) . UPLOADS; - } - - if ( 'dir' == $type ) - return $dir; - if ( 'url' == $type ) - return $url; - return array( 'dir' => $dir, 'url' => $url ); -} - -function wpcf7_captcha_tmp_dir() { - if ( defined( 'WPCF7_CAPTCHA_TMP_DIR' ) ) - return WPCF7_CAPTCHA_TMP_DIR; - else - return wpcf7_upload_dir( 'dir' ) . '/wpcf7_captcha'; -} - -function wpcf7_captcha_tmp_url() { - if ( defined( 'WPCF7_CAPTCHA_TMP_URL' ) ) - return WPCF7_CAPTCHA_TMP_URL; - else - return wpcf7_upload_dir( 'url' ) . '/wpcf7_captcha'; -} - -function wpcf7_upload_tmp_dir() { - if ( defined( 'WPCF7_UPLOADS_TMP_DIR' ) ) - return WPCF7_UPLOADS_TMP_DIR; - else - return wpcf7_upload_dir( 'dir' ) . '/wpcf7_uploads'; -} - -function wpcf7_json( $items ) { - if ( is_array( $items ) ) { - if ( empty( $items ) ) - return 'null'; - - $keys = array_keys( $items ); - $all_int = true; - foreach ( $keys as $key ) { - if ( ! is_int( $key ) ) { - $all_int = false; - break; - } - } - - if ( $all_int ) { - $children = array(); - foreach ( $items as $item ) { - $children[] = wpcf7_json( $item ); - } - return '[' . join( ', ', $children ) . ']'; - } else { // Object - $children = array(); - foreach ( $items as $key => $item ) { - $key = esc_js( (string) $key ); - if ( preg_match( '/[^a-zA-Z]/', $key ) ) - $key = '"' . $key . '"'; - - $children[] = $key . ': ' . wpcf7_json( $item ); - } - return '{ ' . join( ', ', $children ) . ' }'; - } - } elseif ( is_numeric( $items ) ) { - return (string) $items; - } elseif ( is_bool( $items ) ) { - return $items ? '1' : '0'; - } elseif ( is_null( $items ) ) { - return 'null'; - } else { - return '"' . esc_js( (string) $items ) . '"'; - } -} - +' . __( 'Your Name', 'wpcf7' ) . ' ' . __( '(required)', 'wpcf7' ) . '' . __( 'Your Email', 'wpcf7' ) . ' ' . __( '(required)', 'wpcf7' ) . '
' . "\n";
+ $template .= ' [email* your-email]
' . __( 'Subject', 'wpcf7' ) . '
' . "\n";
+ $template .= ' [text your-subject]
' . __( 'Your Message', 'wpcf7' ) . '
' . "\n";
+ $template .= ' [textarea your-message]
[submit "' . __( 'Send', 'wpcf7' ) . '"]
'; + return $template; +} + +function wpcf7_default_mail_template() { + $subject = '[your-subject]'; + $sender = '[your-name] <[your-email]>'; + $body = '[your-message]'; + $recipient = get_option( 'admin_email' ); + return compact( 'subject', 'sender', 'body', 'recipient' ); +} + +function wpcf7_default_mail_2_template() { + $active = false; + $subject = '[your-subject]'; + $sender = '[your-name] <[your-email]>'; + $body = '[your-message]'; + $recipient = '[your-email]'; + return compact( 'active', 'subject', 'sender', 'body', 'recipient' ); +} + +function wpcf7_default_messages_template() { + $mail_sent_ok = wpcf7_default_message( 'mail_sent_ok' ); + $mail_sent_ng = wpcf7_default_message( 'mail_sent_ng' ); + $akismet_says_spam = wpcf7_default_message( 'akismet_says_spam' ); + $validation_error = wpcf7_default_message( 'validation_error' ); + $accept_terms = wpcf7_default_message( 'accept_terms' ); + $invalid_email = wpcf7_default_message( 'invalid_email' ); + $invalid_required = wpcf7_default_message( 'invalid_required' ); + $quiz_answer_not_correct = wpcf7_default_message( 'quiz_answer_not_correct' ); + $captcha_not_match = wpcf7_default_message( 'captcha_not_match' ); + $upload_failed = wpcf7_default_message( 'upload_failed' ); + $upload_file_type_invalid = wpcf7_default_message( 'upload_file_type_invalid' ); + $upload_file_too_large = wpcf7_default_message( 'upload_file_too_large' ); + + return compact( 'mail_sent_ok', 'mail_sent_ng', 'akismet_says_spam', + 'validation_error', 'accept_terms', 'invalid_email', 'invalid_required', 'quiz_answer_not_correct', + 'captcha_not_match', 'upload_failed', 'upload_file_type_invalid', 'upload_file_too_large' ); +} + +function wpcf7_upload_dir( $type = false ) { + $siteurl = get_option( 'siteurl' ); + $upload_path = trim( get_option( 'upload_path' ) ); + if ( empty( $upload_path ) ) + $dir = WP_CONTENT_DIR . '/uploads'; + else + $dir = $upload_path; + + $dir = path_join( ABSPATH, $dir ); + + if ( ! $url = get_option( 'upload_url_path' ) ) { + if ( empty( $upload_path ) || $upload_path == $dir ) + $url = WP_CONTENT_URL . '/uploads'; + else + $url = trailingslashit( $siteurl ) . $upload_path; + } + + if ( defined( 'UPLOADS' ) ) { + $dir = ABSPATH . UPLOADS; + $url = trailingslashit( $siteurl ) . UPLOADS; + } + + if ( 'dir' == $type ) + return $dir; + if ( 'url' == $type ) + return $url; + return array( 'dir' => $dir, 'url' => $url ); +} + +function wpcf7_captcha_tmp_dir() { + if ( defined( 'WPCF8_CAPTCHA_TMP_DIR' ) ) + return WPCF8_CAPTCHA_TMP_DIR; + else + return wpcf7_upload_dir( 'dir' ) . '/wpcf7_captcha'; +} + +function wpcf7_captcha_tmp_url() { + if ( defined( 'WPCF8_CAPTCHA_TMP_URL' ) ) + return WPCF8_CAPTCHA_TMP_URL; + else + return wpcf7_upload_dir( 'url' ) . '/wpcf7_captcha'; +} + +function wpcf7_upload_tmp_dir() { + if ( defined( 'WPCF8_UPLOADS_TMP_DIR' ) ) + return WPCF8_UPLOADS_TMP_DIR; + else + return wpcf7_upload_dir( 'dir' ) . '/wpcf7_uploads'; +} + +function wpcf7_json( $items ) { + if ( is_array( $items ) ) { + if ( empty( $items ) ) + return 'null'; + + $keys = array_keys( $items ); + $all_int = true; + foreach ( $keys as $key ) { + if ( ! is_int( $key ) ) { + $all_int = false; + break; + } + } + + if ( $all_int ) { + $children = array(); + foreach ( $items as $item ) { + $children[] = wpcf7_json( $item ); + } + return '[' . join( ', ', $children ) . ']'; + } else { // Object + $children = array(); + foreach ( $items as $key => $item ) { + $key = esc_js( (string) $key ); + if ( preg_match( '/[^a-zA-Z]/', $key ) ) + $key = '"' . $key . '"'; + + $children[] = $key . ': ' . wpcf7_json( $item ); + } + return '{ ' . join( ', ', $children ) . ' }'; + } + } elseif ( is_numeric( $items ) ) { + return (string) $items; + } elseif ( is_bool( $items ) ) { + return $items ? '1' : '0'; + } elseif ( is_null( $items ) ) { + return 'null'; + } else { + return '"' . esc_js( (string) $items ) . '"'; + } +} + ?> \ No newline at end of file diff --git a/includes/pipe.php b/includes/pipe.php index bd88ed9..c63e4dd 100644 --- a/includes/pipe.php +++ b/includes/pipe.php @@ -1,67 +1,67 @@ -before = $this->after = $text; - } else { - $this->before = substr( $text, 0, $pipe_pos ); - $this->after = substr( $text, $pipe_pos + 1 ); - } - } -} - -class WPCF7_Pipes { - - var $pipes = array(); - - function WPCF7_Pipes( $texts ) { - if ( ! is_array( $texts ) ) - return; - - foreach ( $texts as $text ) { - $this->add_pipe( $text ); - } - } - - function add_pipe( $text ) { - $pipe = new WPCF7_Pipe( $text ); - $this->pipes[] = $pipe; - } - - function do_pipe( $before ) { - foreach ( $this->pipes as $pipe ) { - if ( $pipe->before == $before ) - return $pipe->after; - } - return $before; - } - - function collect_befores() { - $befores = array(); - - foreach ( $this->pipes as $pipe ) { - $befores[] = $pipe->before; - } - - return $befores; - } - - function zero() { - return empty( $this->pipes ); - } - - function random_pipe() { - if ( $this->zero() ) - return null; - - return $this->pipes[array_rand( $this->pipes )]; - } -} - +before = $this->after = $text; + } else { + $this->before = substr( $text, 0, $pipe_pos ); + $this->after = substr( $text, $pipe_pos + 1 ); + } + } +} + +class WPCF8_Pipes { + + var $pipes = array(); + + function WPCF8_Pipes( $texts ) { + if ( ! is_array( $texts ) ) + return; + + foreach ( $texts as $text ) { + $this->add_pipe( $text ); + } + } + + function add_pipe( $text ) { + $pipe = new WPCF8_Pipe( $text ); + $this->pipes[] = $pipe; + } + + function do_pipe( $before ) { + foreach ( $this->pipes as $pipe ) { + if ( $pipe->before == $before ) + return $pipe->after; + } + return $before; + } + + function collect_befores() { + $befores = array(); + + foreach ( $this->pipes as $pipe ) { + $befores[] = $pipe->before; + } + + return $befores; + } + + function zero() { + return empty( $this->pipes ); + } + + function random_pipe() { + if ( $this->zero() ) + return null; + + return $this->pipes[array_rand( $this->pipes )]; + } +} + ?> \ No newline at end of file diff --git a/includes/shortcodes.php b/includes/shortcodes.php index d18e955..4820b49 100644 --- a/includes/shortcodes.php +++ b/includes/shortcodes.php @@ -1,6 +1,6 @@ collect_befores(); $scanned_tag['pipes'] = $pipes; } else { @@ -117,7 +117,7 @@ function shortcode_parse_atts( $text ) { } -$wpcf7_shortcode_manager = new WPCF7_ShortcodeManager(); +$wpcf7_shortcode_manager = new WPCF8_ShortcodeManager(); function wpcf7_add_shortcode( $tag, $func, $has_name = false ) { global $wpcf7_shortcode_manager; diff --git a/languages/wpcf7-el.mo b/languages/wpcf7-el.mo old mode 100755 new mode 100644 diff --git a/languages/wpcf7-el.po b/languages/wpcf7-el.po old mode 100755 new mode 100644 diff --git a/modules/acceptance.php b/modules/acceptance.php index 9c17e34..f981e17 100644 --- a/modules/acceptance.php +++ b/modules/acceptance.php @@ -45,7 +45,7 @@ function wpcf7_acceptance_shortcode_handler( $tag ) { $default_on = (bool) preg_grep( '/^default:on$/i', $options ); - if ( WPCF7_LOAD_JS ) + if ( WPCF8_LOAD_JS ) $onclick = ' onclick="wpcf7ToggleSubmit(this.form);"'; $checked = $default_on ? ' checked="checked"' : ''; diff --git a/modules/captcha.php b/modules/captcha.php index b869f4f..9b39926 100644 --- a/modules/captcha.php +++ b/modules/captcha.php @@ -20,7 +20,7 @@ function wpcf7_captcha_shortcode_handler( $tag ) { return ''; $validation_error = ''; - if ( is_a( $wpcf7_contact_form, 'WPCF7_ContactForm' ) ) + if ( is_a( $wpcf7_contact_form, 'WPCF8_ContactForm' ) ) $validation_error = $wpcf7_contact_form->validation_error( $name ); $atts = ''; @@ -52,7 +52,7 @@ function wpcf7_captcha_shortcode_handler( $tag ) { $atts .= ' class="' . trim( $class_att ) . '"'; // Value. - if ( is_a( $wpcf7_contact_form, 'WPCF7_ContactForm' ) && $wpcf7_contact_form->is_posted() ) + if ( is_a( $wpcf7_contact_form, 'WPCF8_ContactForm' ) && $wpcf7_contact_form->is_posted() ) $value = ''; else $value = $values[0]; @@ -134,7 +134,7 @@ function wpcf7_captcha_validation_filter( $result, $tag ) { function wpcf7_captcha_ajax_echo_filter( $items ) { global $wpcf7_contact_form; - if ( ! is_a( $wpcf7_contact_form, 'WPCF7_ContactForm' ) ) + if ( ! is_a( $wpcf7_contact_form, 'WPCF8_ContactForm' ) ) return $items; if ( ! is_array( $items ) ) diff --git a/modules/checkbox.php b/modules/checkbox.php index d8ecc7b..e27e1f0 100644 --- a/modules/checkbox.php +++ b/modules/checkbox.php @@ -66,12 +66,12 @@ function wpcf7_checkbox_shortcode_handler( $tag ) { $html = ''; - if ( preg_match( '/^checkbox[*]?$/', $type ) && ! $multiple && WPCF7_LOAD_JS ) + if ( preg_match( '/^checkbox[*]?$/', $type ) && ! $multiple && WPCF8_LOAD_JS ) $onclick = ' onclick="wpcf7ExclusiveCheckbox(this);"'; $input_type = rtrim( $type, '*' ); - $posted = is_a( $wpcf7_contact_form, 'WPCF7_ContactForm' ) && $wpcf7_contact_form->is_posted(); + $posted = is_a( $wpcf7_contact_form, 'WPCF8_ContactForm' ) && $wpcf7_contact_form->is_posted(); //Array to store HTML of items until it can be glued together with //