Changeset 1211931

Timestamp:

08/03/2015 04:28:49 PM (9 years ago)

Author:

jadpm

Message:

Prepare Types 1.7.8 release

Location:

types/trunk

Files:

• embedded/bootstrap.php (modified) (1 diff)
• embedded/classes/field.php (modified) (1 diff)
• embedded/classes/loader.php (modified) (1 diff)
• embedded/frontend.php (modified) (4 diffs)
• embedded/functions.php (modified) (1 diff)
• embedded/includes/fields-post.php (modified) (3 diffs)
• embedded/includes/fields/wysiwyg.php (modified) (2 diffs)
• embedded/includes/usermeta-post.php (modified) (2 diffs)
• embedded/plugin.php (modified) (1 diff)
• embedded/readme.txt (modified) (1 diff)
• embedded/usermeta-init.php (modified) (3 diffs)
• includes/settings.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• wpcf.php (modified) (2 diffs)

types/trunk/embedded/bootstrap.php

@@ -134 +134 @@
     // This ones are skipped if used as embedded code!
     if ( !defined( 'WPCF_VERSION' ) ) {
-        define( 'WPCF_VERSION', '1.7.7' );
+        define( 'WPCF_VERSION', '1.7.' );
         define( 'WPCF_META_PREFIX', 'wpcf-' );
     }

types/trunk/embedded/classes/field.php

@@ -716 +716 @@
             $html = htmlspecialchars( $html );
         }
+
+
+
+
+
+
+
+
         // Process shortcodes too
-        $html = do_shortcode( htmlspecialchars_decode( stripslashes( $html ) ) );
+        $html = do_shortcode(  );
         return $html;
     }

types/trunk/embedded/classes/loader.php

@@ -34 +34 @@
                 array('WPCF_Loader', 'renderJsSettings'), 5 );
         add_filter( 'the_posts', array('WPCF_Loader', 'wpcf_cache_complete_postmeta') );
-    }
+        add_filter( 'wpcf_fields_value_save', array( 'WPCF_Loader', 'wpcf_sanitize_values_on_save' ) );
+    }
+    
+    /**
+    * Sanitize fields values on save
+    *
+    */
+    
+    public static function wpcf_sanitize_values_on_save( $value ) {
+        if ( is_array( $value ) ) {
+            // Recursion
+            $value = array_map( array( 'WPCF_Loader', 'wpcf_sanitize_values_on_save' ), $value );
+        } else {
+            if ( current_user_can( 'unfiltered_html' ) ) {
+                $value = wp_filter_post_kses( $value );
+            } else {
+                $value = wp_filter_kses( $value );
+            }
+        }
+        return $value;
+    }
 
     /**

types/trunk/embedded/frontend.php

@@ -126 +126 @@
     // Get field
     $field = types_get_field( $field_id );
+
+
 
     // If field not found return empty string
@@ -328 +330 @@
         $params['field_value'], $field['type'], $field['slug'],
         $field['name'], $params ) );
-    return htmlspecialchars_decode( stripslashes( strval( $output ) ) );
+    
+    if ( 
+        isset( $params['unfiltered_html'] )
+        && $params['unfiltered_html'] === false
+    ) {
+        return stripslashes( strval( $output ) );
+    } else {
+        return htmlspecialchars_decode( stripslashes( strval( $output ) ) );
+    }
 }
 
@@ -495 +505 @@
         return stripslashes( strval( $content ) );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -658 +684 @@
     return $clause;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

types/trunk/embedded/functions.php

@@ -343 +343 @@
         'images_remote_cache_time' => '36',
         'help_box' => 'by_types',
+
+
     );
     $settings = wp_parse_args( get_option( 'wpcf_settings', array() ), $defaults );

types/trunk/embedded/includes/fields-post.php

@@ -154 +154 @@
     // Get groups
     $groups = wpcf_admin_post_get_post_groups_fields( $post );
+
+
+
+
+
+
+
+
+
+
 
     foreach ( $groups as $group ) {
@@ -217 +227 @@
         }
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -570 +605 @@
 {
 
+
+
+
+
+
+
+
+
+
+
+
 
     if ( defined( 'WPTOOLSET_FORMS_VERSION' ) ) {

types/trunk/embedded/includes/fields/wysiwyg.php

@@ -129 +129 @@
     }
 
-    if ( isset( $params['suppress_filters'] ) && $params['suppress_filters'] == 'true' ) {
-        $the_content_filters = array(
-            'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop',
-            'shortcode_unautop', 'prepend_attachment', 'capital_P_dangit', 'do_shortcode');
-        $content = htmlspecialchars_decode( stripslashes( $params['field_value'] ) );
-        foreach ($the_content_filters as $func) {
-            if (  function_exists( $func ) ) {
-                $content = call_user_func($func, $content);
-            }
-        }
-        $output .= $content;
-    } else {
-        /**
-         * remove_shortcode playlist to avoid htmlspecialchars_decode on json 
-         * data
-         */
-        remove_shortcode('playlist', 'wp_playlist_shortcode');
-        $output .= apply_filters( 'the_content', htmlspecialchars_decode( stripslashes( $params['field_value'] ) ) );
-        if ( preg_match_all('/playlist[^\]]+/', $output, $matches ) ) {
-            foreach( $matches[0] as $one ) {
-                $re = '/'.$one.'/';
-                $one = preg_replace('/\&\#(8221|8243);/', '"', $one);
-                $output = preg_replace($re, $one, $output);
-            }
-        }
-        add_shortcode( 'playlist', 'wp_playlist_shortcode' );
-    }
+    // We'll only run a limited number of filters.
+    // We need to do this to avoid issues after the WP 4.2.3 shortcode API changes.
+    
+    $the_content_filters = array(
+        'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop',
+        'shortcode_unautop', 'prepend_attachment', 'capital_P_dangit', 'do_shortcode');
+    
+    /**
+     * remove_shortcode playlist to avoid htmlspecialchars_decode on json 
+     * data
+     */
+    remove_shortcode('playlist', 'wp_playlist_shortcode');
+    
+    if ( 
+        isset( $params['unfiltered_html'] )
+        && $params['unfiltered_html'] === false
+    ) {
+        $content = stripslashes( $params['field_value'] );
+    } else {
+        $content = htmlspecialchars_decode( stripslashes( $params['field_value'] ) );
+    }
+    
+    foreach ($the_content_filters as $func) {
+        if (  function_exists( $func ) ) {
+            $content = call_user_func($func, $content);
+        }
+    }
+    if ( preg_match_all('/playlist[^\]]+/', $output, $matches ) ) {
+        foreach( $matches[0] as $one ) {
+            $re = '/'.$one.'/';
+            $one = preg_replace('/\&\#(8221|8243);/', '"', $one);
+            $output = preg_replace($re, $one, $output);
+        }
+    }
+    add_shortcode( 'playlist', 'wp_playlist_shortcode' );
+
+    $output .= $content;
     if ( !empty( $params['style'] ) || !empty( $params['class'] ) ) {
         $output .= '</div>';
@@ -161 +171 @@
     return $output;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

types/trunk/embedded/includes/usermeta-post.php

@@ -26 +26 @@
     $profile_only_preview = '';
 
-
+    if ( current_user_can( 'unfiltered_html' ) ) {
+        $can_unfiltered_html = get_user_meta( $user_id->ID, '_wpcf_usermeta_fields_unfiltered_html', true );
+        $can_unfiltered_html = empty( $can_unfiltered_html ) ? 'on' : $can_unfiltered_html;
+        $disabled = '';
+        if ( wpcf_get_settings('usermeta_unfiltered_html') == 'off' ) {
+            $can_unfiltered_html = 'off';
+            $disabled = ' disabled="disabled"';
+        }
+        ?>
+        <h3><?php _e( 'Types usermeta fields - unfiltered HTML', 'wpcf' ) ?></h3>
+        <table class="form-table">
+            <tbody>
+                <tr>
+                    <th>
+                        <?php _e( 'Unfiltered HTML', 'wpcf' ) ?>
+                    </th>
+                    <td>
+                        <input id="wpcf_postmeta_fields_can_unfiltered_html_on" type="radio" name="_wpcf_usermeta_fields_unfiltered_html" value="on" <?php checked( $can_unfiltered_html, 'on' ); echo $disabled; ?> />
+                        <label for="wpcf_postmeta_fields_can_unfiltered_html_on">
+                            <?php _e( 'Enable unfiltered HTML in Types usermeta fields for this user', 'wpcf' ); ?>
+                        </label>
+                        <br />
+                        <input id="wpcf_postmeta_fields_can_unfiltered_html_off" type="radio" name="_wpcf_usermeta_fields_unfiltered_html" value="off" <?php checked( $can_unfiltered_html, 'off' ); echo $disabled; ?> />
+                        <label for="wpcf_postmeta_fields_can_unfiltered_html_off">
+                            <?php _e( 'Disable unfiltered HTML in Types usermeta fields for this user', 'wpcf' ); ?>
+                        </label>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <?php
+    }
+    
     foreach ( $groups as $group ) {
         if ( !empty( $group['fields'] ) ) {
@@ -327 +359 @@
 function wpcf_admin_userprofilesave_init($user_id){
 
+
+
+
+
+
+
+
+
+
+
+
+
     if ( defined( 'WPTOOLSET_FORMS_VERSION' ) ) {
 

types/trunk/embedded/plugin.php

@@ -6 +6 @@
   Author: OnTheGoSystems
   Author URI: http://www.onthegosystems.com
-  Version: 1.7.7
+  Version: 1.7.
  */
 /**

types/trunk/embedded/readme.txt

@@ -5 +5 @@
 License: GPLv2
 Requires at least: 3.4
-Tested up to: 4.2.2
-Stable tag: 1.6.6.6
+Tested up to: 4.2.
+Stable tag: 1.
 
 The Embedded version lets you create custom types, taxonomies and fields for your theme or plugin, without requiring any plugin.

types/trunk/embedded/usermeta-init.php

@@ -422 +422 @@
     $field = wpcf_fields_get_field_by_slug( $field_id, 'wpcf-usermeta' );
 
+
+
 
     // If field not found return empty string
@@ -598 +600 @@
     // Set field
     $wpcf->usermeta_field->set( $user_id, $field );
+
+
 
 
@@ -680 +684 @@
 //    $wpcf->usermeta_field->set( $user_id, $field );
     return $wpcf->usermeta_field->html( $html, $params );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

types/trunk/includes/settings.php

@@ -92 +92 @@
             '#title' => __("When importing, add texts to WPML's String Translation table",
                     'wpcf'),
-            '#inline' => true,
+            '#inline' => e,
             '#default_value' => !empty($settings['register_translations_on_import']),
             '#after' => '<br />',
@@ -133 +133 @@
         '#inline' => false,
         '#default_value' => $settings['help_box'],
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     );
     $form['submit'] = array(
@@ -201 +240 @@
     $settings = wpcf_get_settings();
     $data = $_POST['wpcf_settings'];
-    foreach (array('register_translations_on_import','help_box') as $setting) {
+    foreach (array('register_translations_on_import','help_box') as $setting) {
         if (!isset($data[$setting])) {
             $settings[$setting] = 0;

types/trunk/readme.txt

@@ -5 +5 @@
 License: GPLv2
 Requires at least: 3.4
-Tested up to: 4.2.2
-Stable tag: 1.7.7
+Tested up to: 4.2.
+Stable tag: 1.7.
 
 The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
@@ -155 +155 @@
 
 == Changelog ==
+
+
+
+
+
+
 
 = 1.7.7 =

types/trunk/wpcf.php

@@ -6 +6 @@
   Author: OnTheGoSystems
   Author URI: http://www.onthegosystems.com
-  Version: 1.7.7
+  Version: 1.7.
  */
 /**
@@ -17 +17 @@
      * make sure that WPCF_VERSION in embedded/bootstrap.php is the same!
      */
-    define( 'WPCF_VERSION', '1.7.7' );
+    define( 'WPCF_VERSION', '1.7.' );
 }