WordPress.org

Plugin Directory

Changeset 973824


Ignore:
Timestamp:
08/27/14 08:49:51 (4 years ago)
Author:
brucepearson
Message:

Bug fix for 1.6

Location:
types/trunk
Files:
62 edited

Legend:

Unmodified
Added
Removed
  • types/trunk/admin.php

    r970205 r973824  
    44 * Admin functions 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/admin.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/admin.php $ 
    77 * $LastChangedDate: 2014-08-12 10:19:36 +0800 (Tue, 12 Aug 2014) $ 
    88 * $LastChangedRevision: 25849 $ 
  • types/trunk/embedded/bootstrap.php

    r970205 r973824  
    88 * @since Types 1.2 
    99 * 
    10  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/bootstrap.php $ 
    11  * $LastChangedDate: 2014-08-20 09:26:19 +0800 (Wed, 20 Aug 2014) $ 
    12  * $LastChangedRevision: 26150 $ 
     10 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/bootstrap.php $ 
     11 * $LastChangedDate: 2014-08-26 20:46:08 +0800 (Tue, 26 Aug 2014) $ 
     12 * $LastChangedRevision: 26453 $ 
    1313 * $LastChangedBy: bruce $ 
    1414 * 
     
    132132    // This ones are skipped if used as embedded code! 
    133133    if ( !defined( 'WPCF_VERSION' ) ) { 
    134         define( 'WPCF_VERSION', '1.6' ); 
     134        define( 'WPCF_VERSION', '1.6.1' ); 
    135135        define( 'WPCF_META_PREFIX', 'wpcf-' ); 
    136136    } 
  • types/trunk/embedded/classes/class.wpcf-post-types.php

    r970205 r973824  
    44 * Post Types Class 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/classes/class.wpcf-post-types.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/classes/class.wpcf-post-types.php $ 
    77 * $LastChangedDate: 2014-05-13 18:49:25 +0800 (Tue, 13 May 2014) $ 
    88 * $LastChangedRevision: 22267 $ 
  • types/trunk/embedded/classes/field.php

    r970205 r973824  
    717717            return $html; 
    718718        } else { 
    719             $html = esc_attr( $html ); 
     719            $html = htmlspecialchars( $html ); 
    720720        } 
    721721        // Process shortcodes too 
    722722//        $shortcode = do_shortcode( $html ); 
    723         $html = do_shortcode( htmlspecialchars_decode( $html ) ); 
     723        $html = do_shortcode( htmlspecialchars_decode( stripslashes( $html ) ) ); 
    724724 
    725725        return $html; 
  • types/trunk/embedded/classes/loader.php

    r970205 r973824  
    44 * Loader class 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/classes/loader.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/classes/loader.php $ 
    77 * $LastChangedDate: 2014-06-27 01:13:20 +0800 (Fri, 27 Jun 2014) $ 
    88 * $LastChangedRevision: 24403 $ 
  • types/trunk/embedded/classes/path.php

    r970205 r973824  
    33 * WPCF_Path 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/classes/path.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/classes/path.php $ 
    66 * $LastChangedDate: 2014-05-12 22:47:19 +0800 (Mon, 12 May 2014) $ 
    77 * $LastChangedRevision: 22250 $ 
  • types/trunk/embedded/classes/post-types/messages.php

    r970205 r973824  
    33 * Messages. 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/classes/post-types/messages.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/classes/post-types/messages.php $ 
    66 * $LastChangedDate: 2014-05-13 18:49:25 +0800 (Tue, 13 May 2014) $ 
    77 * $LastChangedRevision: 22267 $ 
  • types/trunk/embedded/common/debug/debug-information.php

    r970205 r973824  
    44 * produce debug information 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/debug/debug-information.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/debug/debug-information.php $ 
    77 * $LastChangedDate: 2014-08-13 09:38:06 +0800 (Wed, 13 Aug 2014) $ 
    88 * $LastChangedRevision: 25892 $ 
  • types/trunk/embedded/common/debug/functions_debug_information.php

    r970205 r973824  
    33  * produce debug information 
    44  * 
    5   * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/debug/functions_debug_information.php $ 
     5  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/debug/functions_debug_information.php $ 
    66  * $LastChangedDate: 2014-08-12 23:40:07 +0800 (Tue, 12 Aug 2014) $ 
    77  * $LastChangedRevision: 25886 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.audio.php

    r970205 r973824  
    77 * @author Srdjan 
    88 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.audio.php $ 
    10  * $LastChangedDate: 2014-07-29 23:56:51 +0800 (Tue, 29 Jul 2014) $ 
    11  * $LastChangedRevision: 25431 $ 
    12  * $LastChangedBy: marcin $ 
     9 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.audio.php $ 
     10 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     11 * $LastChangedRevision: 26350 $ 
     12 * $LastChangedBy: francesco $ 
    1313 * 
    1414 */ 
    1515class WPToolset_Field_Audio extends WPToolset_Field_File 
    1616{ 
    17  
    1817    protected $_settings = array('min_wp_version' => '3.6'); 
    1918 
    2019    public function metaform() 
    2120    { 
    22         $form = parent::metaform(); 
    23         return self::setForm($form); 
     21        $validation = $this->getValidationData(); 
     22        $validation = self::addTypeValidation($validation); 
     23        $this->setValidationData($validation); 
     24        return parent::metaform();         
    2425    } 
    25  
    26     public static function setForm($form) 
    27     { 
    28         if ( !isset( $form[0] ) || !is_array($form[0] ) ) { 
    29             return $form; 
    30         } 
    31         if ( !array_key_exists( '#validate', $form[0] ) ) { 
    32             $form[0]['#validate'] = array(); 
    33         } 
    34         if ( !array_key_exists( 'extension', $form[0]['#validate'] ) ) { 
    35             $form[0]['#validate']['extension'] = array( 
    36                 'args' => array( 
    37                     'extension', 
    38                     '16svx|2sf|8svx|aac|aif|aifc|aiff|amr|ape|asf|ast|au|aup|band|brstm|bwf|cdda|cust|dsf|dwd|flac|gsf|gsm|gym|it|jam|la|ly|m4a|m4p|mid|minipsf|mng|mod|mp1|mp2|mp3|mp4|mpc|mscz|mt2|mus|niff|nsf|off|ofr|ofs|ots|pac|psf|psf2|psflib|ptb|qsf|ra|raw|rka|rm|rmj|s3m|shn|sib|sid|smp|spc|spx|ssf|swa|tta|txm|usf|vgm|voc|vox|vqf|wav|wma|wv|xm|ym', 
    39                 ), 
    40                 'message' => __( 'You can add only audio.', 'wpv-views' ), 
    41             ); 
    42         } 
    43         return $form; 
     26     
     27    public static function addTypeValidation($validation) { 
     28        $validation['extension'] = array( 
     29            'args' => array( 
     30                'extension', 
     31                '16svx|2sf|8svx|aac|aif|aifc|aiff|amr|ape|asf|ast|au|aup|band|brstm|bwf|cdda|cust|dsf|dwd|flac|gsf|gsm|gym|it|jam|la|ly|m4a|m4p|mid|minipsf|mng|mod|mp1|mp2|mp3|mp4|mpc|mscz|mt2|mus|niff|nsf|off|ofr|ofs|ogg|ots|pac|psf|psf2|psflib|ptb|qsf|ra|raw|rka|rm|rmj|s3m|shn|sib|sid|smp|spc|spx|ssf|swa|tta|txm|usf|vgm|voc|vox|vqf|wav|wma|wv|xm|ym', 
     32            ), 
     33            'message' => __( 'You can add only audio.', 'wpv-views' ), 
     34        ); 
     35        return $validation; 
    4436    } 
    4537} 
  • types/trunk/embedded/common/toolset-forms/classes/class.checkboxes.php

    r970205 r973824  
    55 * @author Srdjan 
    66 * 
    7  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.checkboxes.php $ 
    8  * $LastChangedDate: 2014-08-06 00:42:25 +0800 (Wed, 06 Aug 2014) $ 
    9  * $LastChangedRevision: 25659 $ 
    10  * $LastChangedBy: juan $ 
     7 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.checkboxes.php $ 
     8 * $LastChangedDate: 2014-08-27 10:51:19 +0800 (Wed, 27 Aug 2014) $ 
     9 * $LastChangedRevision: 26470 $ 
     10 * $LastChangedBy: bruce $ 
    1111 * 
    1212 */ 
     
    2121        $value = $this->getValue(); 
    2222        $data = $this->getData(); 
    23         $name = $this->getName(); 
     23        $name = $this->getName(); 
    2424        $form = array(); 
    2525        $_options = array(); 
     
    3838                //    $checked=true; 
    3939                //} 
    40                  
     40 
    4141                $_options[$option_key] = array( 
    4242                    '#value' => $option['value'], 
     
    4747                    //'#inline' => true, 
    4848                ); 
     49                 
     50                if ( isset( $option['data-value'] ) ) { 
     51                    //Fixing https://icanlocalize.basecamphq.com/projects/7393061-toolset/todo_items/188528502/comments 
     52                    $_options[$option_key]['#attributes'] = array('data-value' => $option['data-value']); 
     53                } 
    4954                 
    5055                if ( !is_admin() ) {// TODO maybe add a doing_ajax() check too, what if we want to load a form using AJAX? 
  • types/trunk/embedded/common/toolset-forms/classes/class.colorpicker.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.colorpicker.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.colorpicker.php $ 
    55 * $LastChangedDate: 2014-07-12 16:38:18 +0800 (Sat, 12 Jul 2014) $ 
    66 * $LastChangedRevision: 24908 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.conditional.php

    r970205 r973824  
    273273     */ 
    274274    public static function evaluateCustom( $evaluate, $values ) { 
    275  
    276275        $evaluate = trim( stripslashes( $evaluate ) ); 
    277276        // Check dates 
  • types/trunk/embedded/common/toolset-forms/classes/class.credaudio.php

    r970205 r973824  
    11<?php 
    22require_once 'class.credfile.php'; 
     3require_once 'class.audio.php'; 
    34 
    45/** 
     
    78 * @author Srdjan 
    89 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.credaudio.php $ 
    10  * $LastChangedDate: 2014-08-14 21:05:33 +0800 (Thu, 14 Aug 2014) $ 
    11  * $LastChangedRevision: 25980 $ 
     10 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.credaudio.php $ 
     11 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     12 * $LastChangedRevision: 26350 $ 
    1213 * $LastChangedBy: francesco $ 
    1314 * 
     
    2122        //TODO: check if this getValidationData does not break PHP Validation _cakePHP required file. 
    2223        $validation = $this->getValidationData(); 
    23         $validation['extension'] = array( 
    24                 'args' => array( 
    25                     'extension', 
    26                     '16svx|2sf|8svx|aac|aif|aifc|aiff|amr|ape|asf|ast|au|aup|band|brstm|bwf|cdda|cust|dsf|dwd|flac|gsf|gsm|gym|it|jam|la|ly|m4a|m4p|mid|minipsf|mng|mod|mp1|mp2|mp3|mp4|mpc|mscz|mt2|mus|niff|nsf|off|ofr|ofs|ogg|ots|pac|psf|psf2|psflib|ptb|qsf|ra|raw|rka|rm|rmj|s3m|shn|sib|sid|smp|spc|spx|ssf|swa|tta|txm|usf|vgm|voc|vox|vqf|wav|wma|wv|xm|ym', 
    27                 ), 
    28                 'message' => __( 'You can add only audio.', 'wpv-views' ), 
    29             ); 
     24        $validation = WPToolset_Field_Audio::addTypeValidation($validation); 
    3025        $this->setValidationData($validation); 
    3126        return parent::metaform(); 
  • types/trunk/embedded/common/toolset-forms/classes/class.credfile.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.credfile.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.credfile.php $ 
    55 * $LastChangedDate: 2014-08-09 05:11:46 +0800 (Sat, 09 Aug 2014) $ 
    66 * $LastChangedRevision: 25806 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.credimage.php

    r970205 r973824  
    11<?php 
    22require_once 'class.credfile.php'; 
     3require_once 'class.image.php'; 
    34 
    45/** 
     
    78 * @author Srdjan 
    89 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.credimage.php $ 
    10  * $LastChangedDate: 2014-08-14 21:05:33 +0800 (Thu, 14 Aug 2014) $ 
    11  * $LastChangedRevision: 25980 $ 
     10 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.credimage.php $ 
     11 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     12 * $LastChangedRevision: 26350 $ 
    1213 * $LastChangedBy: francesco $ 
    1314 * 
     
    1920        //TODO: check if this getValidationData does not break PHP Validation _cakePHP required file. 
    2021        $validation = $this->getValidationData(); 
    21         $validation['extension'] = array( 
    22                 'args' => array( 
    23                     'extension', 
    24                     'jpg|jpeg|gif|png|bmp|webp', 
    25                 ), 
    26                 'message' => __( 'You can add only images.', 'wpv-views' ), 
    27             ); 
     22        $validation = WPToolset_Field_Image::addTypeValidation($validation); 
    2823        $this->setValidationData($validation); 
    2924        return parent::metaform();         
  • types/trunk/embedded/common/toolset-forms/classes/class.credvideo.php

    r970205 r973824  
    11<?php 
    22require_once 'class.credfile.php'; 
     3require_once 'class.video.php'; 
    34 
    45/** 
     
    78 * @author Srdjan 
    89 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.credvideo.php $ 
    10  * $LastChangedDate: 2014-08-14 21:05:33 +0800 (Thu, 14 Aug 2014) $ 
    11  * $LastChangedRevision: 25980 $ 
     10 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.credvideo.php $ 
     11 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     12 * $LastChangedRevision: 26350 $ 
    1213 * $LastChangedBy: francesco $ 
    1314 * 
     
    2122        //TODO: check if this getValidationData does not break PHP Validation _cakePHP required file. 
    2223        $validation = $this->getValidationData(); 
    23         $validation['extension'] = array( 
    24                 'args' => array( 
    25                     'extension', 
    26                     '3gp|aaf|asf|avchd|avi|cam|dat|dsh|fla|flr|flv|m1v|m2v|m4v|mng|mp4|mxf|nsv|ogg|rm|roq|smi|sol|svi|swf|wmv|wrap|mkv|mov|mpe|mpeg|mpg', 
    27                 ), 
    28                 'message' => __( 'You can add only video.', 'wpv-views' ), 
    29             ); 
     24        $validation = WPToolset_Field_Video::addTypeValidation($validation); 
    3025        $this->setValidationData($validation); 
    3126        return parent::metaform();         
  • types/trunk/embedded/common/toolset-forms/classes/class.date.scripts.php

    r970205 r973824  
    5454            WPTOOLSET_FORMS_VERSION 
    5555        ); 
    56         wp_register_style( 
    57             'wptoolset-field-date', 
    58             WPTOOLSET_FORMS_RELPATH . '/css/wpt-jquery-ui/jquery-ui-1.9.2.custom.min.css', 
    59             array('wptoolset-field-datepicker'), 
    60             WPTOOLSET_FORMS_VERSION 
    61         ); 
    6256        /** 
    6357         * scripts 
     
    106100         * styles 
    107101         */ 
    108         wp_enqueue_style( 'wptoolset-field-date' ); 
     102        wp_enqueue_style( 'wptoolset-field-datepicker' ); 
    109103        /** 
    110104         * scripts 
  • types/trunk/embedded/common/toolset-forms/classes/class.fieldconfig.php

    r970205 r973824  
    9797                    foreach ($attrs['actual_titles'] as $refvalue=>$title) { 
    9898                        $value = $attrs['actual_values'][$refvalue]; 
    99                         $arr[$refvalue] = array('value'=>$refvalue,'title'=>$title,'name'=>$name); 
     99                        $arr[$refvalue] = array('value'=>$refvalue,'title'=>$title,'name'=>$name,'data-value'=>$value); 
    100100                        if ( in_array($refvalue, $attrs['default']) ) { 
    101101                            $arr[$refvalue]['checked'] = true; 
  • types/trunk/embedded/common/toolset-forms/classes/class.file.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.file.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.file.php $ 
    55 * $LastChangedDate: 2014-08-08 22:42:50 +0800 (Fri, 08 Aug 2014) $ 
    66 * $LastChangedRevision: 25798 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.form_factory.php

    r970205 r973824  
    128128     * @see classes/FormAbstract::createForm() 
    129129     */ 
    130     public function createForm( $nameForm = 'default' ) { 
     130    public function createForm( $nameForm /*= 'default'*/ ) { 
    131131        if ( $this->formNameExists( $nameForm ) ) return; 
    132132        $this->theForm->autoHandle( $nameForm, $this->form ); 
     
    145145     * @see classes/FormAbstract::displayForm() 
    146146     */ 
    147     public function displayForm( $nameForm = 'default' ) { 
     147    public function displayForm( $nameForm /*= 'default'*/ ) { 
    148148        if ( $this->formNameExists( $nameForm ) ) return; 
    149149        $myform = $this->theForm; 
     
    339339                )  
    340340            {    
    341                 $field_value = isset($_POST[$field->getName()])?$_POST[$field->getName()]:""; 
     341                //https://icanlocalize.basecamphq.com/projects/7393061-toolset/todo_items/188604193/comments 
     342                //added sanitize_text_field for sucuri warning php.backdoor.eval_POST.010 
     343                $field_value = isset($_POST[$field->getName()])?sanitize_text_field($_POST[$field->getName()]):""; 
    342344                if ($field->getType()=='skype') { 
    343                     $field_value = @$_POST[$field->getName()]['skypename']; 
     345                    $field_value = isset($_POST[$field->getName()]['skypename'])?sanitize_text_field($_POST[$field->getName()]['skypename']):""; 
    344346                } 
     347                //########################################################################################## 
    345348                 
    346349                $_tmp = $field->getValidationData(); 
  • types/trunk/embedded/common/toolset-forms/classes/class.image.php

    r970205 r973824  
    77 * @author Srdjan 
    88 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.image.php $ 
    10  * $LastChangedDate: 2014-07-29 23:56:51 +0800 (Tue, 29 Jul 2014) $ 
    11  * $LastChangedRevision: 25431 $ 
    12  * $LastChangedBy: marcin $ 
     9 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.image.php $ 
     10 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     11 * $LastChangedRevision: 26350 $ 
     12 * $LastChangedBy: francesco $ 
    1313 * 
    1414 */ 
     
    1717    public function metaform() 
    1818    { 
    19         $form = parent::metaform(); 
    20         return self::setForm($form); 
     19        $validation = $this->getValidationData(); 
     20        $validation = self::addTypeValidation($validation); 
     21        $this->setValidationData($validation); 
     22        return parent::metaform();         
    2123    } 
    2224 
    23     public static function setForm($form) 
    24     { 
    25         if ( !isset( $form[0] ) || !is_array($form[0] ) ) { 
    26             return $form; 
    27         } 
    28         if ( !array_key_exists( '#validate', $form[0] ) ) { 
    29             $form[0]['#validate'] = array(); 
    30         } 
    31         if ( !array_key_exists( 'extension', $form[0]['#validate'] ) ) { 
    32             $form[0]['#validate']['extension'] = array( 
    33                 'args' => array( 
    34                     'extension', 
    35                     'jpg|jpeg|gif|png', 
    36                 ), 
    37                 'message' => __( 'You can add only images.', 'wpv-views' ), 
    38             ); 
    39         } 
    40         return $form; 
    41     } 
     25    public static function addTypeValidation($validation) { 
     26        $validation['extension'] = array( 
     27            'args' => array( 
     28                'extension', 
     29                'jpg|jpeg|gif|png|bmp|webp', 
     30            ), 
     31            'message' => __( 'You can add only images.', 'wpv-views' ), 
     32        ); 
     33        return $validation; 
     34    }     
    4235} 
  • types/trunk/embedded/common/toolset-forms/classes/class.radios.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.radios.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.radios.php $ 
    55 * $LastChangedDate: 2014-08-14 15:35:38 +0800 (Thu, 14 Aug 2014) $ 
    66 * $LastChangedRevision: 25961 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.repetitive.php

    r970205 r973824  
    33 * Repetitive controller 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.repetitive.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.repetitive.php $ 
    66 * $LastChangedDate: 2014-07-03 15:27:50 +0800 (Thu, 03 Jul 2014) $ 
    77 * $LastChangedRevision: 24580 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.select.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.select.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.select.php $ 
    55 * $LastChangedDate: 2014-07-29 22:50:22 +0800 (Tue, 29 Jul 2014) $ 
    66 * $LastChangedRevision: 25428 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.skype.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.skype.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.skype.php $ 
    55 * $LastChangedDate: 2014-08-06 00:18:16 +0800 (Wed, 06 Aug 2014) $ 
    66 * $LastChangedRevision: 25657 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.taxonomyhierarchical.php

    r970205 r973824  
    3535        $all = $this->buildTerms(get_terms($this->getName(),array('hide_empty'=>0,'fields'=>'all'))); 
    3636 
     37         
     38         
    3739        $childs=array(); 
    3840        $names=array(); 
     
    4446        } 
    4547 
     48//        ksort($childs); 
     49                 
    4650        $this->childs = $childs; 
    4751        $this->names = $names; 
     
    275279    private function buildCheckboxes( $index, &$childs, &$names, &$metaform, $level = 0, $parent = -1 ) 
    276280    { 
    277  
    278281        if (isset($childs[$index])) { 
    279282            $level_count = count( $childs[$index] ); 
    280             foreach ( $childs[$index] as $tkey => $tid ) { 
     283            foreach ( $childs[$index] as $tkey => $tid ) { 
    281284                $name = $names[$tid]; 
    282285                /** 
     
    305308                        ); 
    306309                         
    307                 if ( $tkey == 0 ) { 
    308                     if ($level > 0) { 
    309                         $item['#before'] = '<li><ul class="wpt-form-set-children wpt-form-set-children-level-' . $level . '" data-level="' . $level . '"><li>'; 
    310                     } else  { 
    311                         $item['#before'] = '<ul class="wpt-form-set wpt-form-set-checkboxes wpt-form-set-checkboxes-' . $this->getName() . '" data-level="0"><li>'; 
    312                     } 
    313                 } else if ( $tkey == ( $level_count - 1 ) ) { 
    314                     if ($level > 0) { 
    315                         $item['#after'] = '</li></ul></li>'; 
    316                     } else { 
    317                         $item['#after'] = '</li></ul>'; 
    318                     } 
    319                 } 
    320  
     310                if ( $tkey == 0 ) { 
     311                    if ($level > 0) { 
     312                        $item['#before'] = '<li><ul class="wpt-form-set-children wpt-form-set-children-level-' . $level . '" data-level="' . $level . '"><li>'; 
     313                    } else  { 
     314                        $item['#before'] = '<ul class="wpt-form-set wpt-form-set-checkboxes wpt-form-set-checkboxes-' . $this->getName() . '" data-level="0"><li>'; 
     315                    } 
     316                } 
     317                if ( $tkey == ( $level_count - 1 ) ) { 
     318                    $item['#after'] = '</li>'; 
     319                } 
     320                 
    321321                $metaform[] = $item; 
    322322 
    323                 if ( isset( $childs[$tid] ) ) { 
     323                if ( isset( $childs[$tid] ) ) {       
    324324                    $metaform = $this->buildCheckboxes( $tid, $childs, $names, $metaform, $level + 1, $tid ); 
    325325                } 
    326  
    327             } 
    328         } 
     326                 
     327            } 
     328        } 
     329         
     330        if (count($metaform)) { 
     331            if ($level == 0) { 
     332                $metaform[count($metaform) - 1]['#after'] .= '</ul>'; 
     333            } else  { 
     334                $metaform[count($metaform) - 1]['#after'] .= '</ul></li>'; 
     335            } 
     336        } 
     337         
    329338        return $metaform; 
    330339    } 
  • types/trunk/embedded/common/toolset-forms/classes/class.textarea.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.textarea.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.textarea.php $ 
    55 * $LastChangedDate: 2014-07-10 16:46:40 +0800 (Thu, 10 Jul 2014) $ 
    66 * $LastChangedRevision: 24820 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.textfield.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.textfield.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.textfield.php $ 
    55 * $LastChangedDate: 2014-07-09 16:26:51 +0800 (Wed, 09 Jul 2014) $ 
    66 * $LastChangedRevision: 24777 $ 
  • types/trunk/embedded/common/toolset-forms/classes/class.video.php

    r970205 r973824  
    77 * @author Srdjan 
    88 * 
    9  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/classes/class.video.php $ 
    10  * $LastChangedDate: 2014-07-29 23:56:51 +0800 (Tue, 29 Jul 2014) $ 
    11  * $LastChangedRevision: 25431 $ 
    12  * $LastChangedBy: marcin $ 
     9 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/classes/class.video.php $ 
     10 * $LastChangedDate: 2014-08-22 18:23:29 +0800 (Fri, 22 Aug 2014) $ 
     11 * $LastChangedRevision: 26350 $ 
     12 * $LastChangedBy: francesco $ 
    1313 * 
    1414 */ 
     
    1919    public function metaform() 
    2020    { 
    21         $form = parent::metaform(); 
    22         return self::setForm($form); 
     21        $validation = $this->getValidationData(); 
     22        $validation = self::addTypeValidation($validation); 
     23        $this->setValidationData($validation); 
     24        return parent::metaform(); 
    2325    } 
    24  
    25     public static function setForm($form) 
    26     { 
    27         if ( !isset( $form[0] ) || !is_array($form[0] ) ) { 
    28             return $form; 
    29         } 
    30         if ( !array_key_exists( '#validate', $form[0] ) ) { 
    31             $form[0]['#validate'] = array(); 
    32         } 
    33         if ( !array_key_exists( 'extension', $form[0]['#validate'] ) ) { 
    34             $form[0]['#validate']['extension'] = array( 
    35                 'args' => array( 
    36                     'extension', 
    37                     '3gp|aaf|asf|avchd|avi|cam|dat|dsh|fla|flr|flv|m1v|m2v|m4v|mng|mp4|mxf|nsv|ogg|rm|roq|smi|sol|svi|swf|wmv|wrap|mkv|mov|mpe|mpeg|mpg', 
    38                 ), 
    39                 'message' => __( 'You can add only video.', 'wpv-views' ), 
    40             ); 
    41         } 
    42         return $form; 
    43     } 
     26     
     27    public static function addTypeValidation($validation) { 
     28        $validation['extension'] = array( 
     29            'args' => array( 
     30                'extension', 
     31                '3gp|aaf|asf|avchd|avi|cam|dat|dsh|fla|flr|flv|m1v|m2v|m4v|mng|mp4|mxf|nsv|ogg|rm|roq|smi|sol|svi|swf|wmv|wrap|mkv|mov|mpe|mpeg|mpg', 
     32            ), 
     33            'message' => __( 'You can add only video.', 'wpv-views' ), 
     34        ); 
     35        return $validation; 
     36    }     
    4437} 
  • types/trunk/embedded/common/toolset-forms/classes/class.wysiwyg.php

    r970205 r973824  
    4040 
    4141    protected function _editor(&$attributes) 
    42     {         
     42    { 
     43 
     44 
    4345        if (isset($attributes['readonly'])&&$attributes['readonly']=='readonly') { 
    44             add_filter( 'tiny_mce_before_init', function( $args ) { 
    45                 // do you existing check for published here 
    46                 if ( 1 == 1 ) 
    47                      $args['readonly'] = 1; 
    48  
    49                 return $args; 
    50             } ); 
     46            add_filter( 'tiny_mce_before_init',  array(&$this, 'tiny_mce_before_init_callback')); 
    5147        } 
    5248 
     
    7874   } 
    7975 
     76    /*RICCARDO: removed anonymous function for retrocompatibility */ 
     77    public function tiny_mce_before_init_callback( $args ) { 
     78        // do you existing check for published here 
     79        if ( 1 == 1 ) 
     80            $args['readonly'] = 1; 
     81 
     82        return $args; 
     83    } 
     84 
    8085} 
  • types/trunk/embedded/common/toolset-forms/css/wpt-jquery-ui/datepicker.css

    r908319 r973824  
    1111/* Layout helpers 
    1212----------------------------------*/ 
    13 .ui-helper-hidden { display: none; } 
    14 .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } 
    15 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } 
    16 .ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } 
    17 .ui-helper-clearfix { display: inline-block; } 
     13.ui-datepicker.ui-helper-hidden { display: none; } 
     14.ui-datepicker.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } 
     15.ui-datepicker.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } 
     16.ui-datepicker.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } 
     17.ui-datepicker.ui-helper-clearfix { display: inline-block; } 
    1818/* required comment for clearfix to work in Opera \*/ 
    19 * html .ui-helper-clearfix { height:1%; } 
    20 .ui-helper-clearfix { display:block; } 
     19* html .ui-datepicker.ui-helper-clearfix { height:1%; } 
     20.ui-datepicker.ui-helper-clearfix { display:block; } 
    2121/* end clearfix */ 
    22 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } 
     22.ui-datepicker.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } 
    2323 
    2424 
    2525/* Interaction Cues 
    2626----------------------------------*/ 
    27 .ui-state-disabled { cursor: default !important; } 
     27.ui-datepicker .ui-state-disabled { cursor: default !important; } 
    2828 
    2929 
     
    3232 
    3333/* states and images */ 
    34 .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } 
     34.ui-datepicker .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } 
    3535 
    3636 
     
    3939 
    4040/* Overlays */ 
    41 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } 
     41.ui-datepicker .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } 
    4242 
    4343 
     
    5757/* Component containers 
    5858----------------------------------*/ 
    59 .ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; } 
    60 .ui-widget .ui-widget { font-size: 1em; } 
    61 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; } 
    62 .ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } 
    63 .ui-widget-content a { color: #333333; } 
    64 .ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } 
    65 .ui-widget-header a { color: #ffffff; } 
     59.ui-datepicker.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; } 
     60.ui-datepicker.ui-widget .ui-widget { font-size: 1em; } 
     61.ui-datepicker.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; } 
     62.ui-datepicker.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } 
     63/*.ui-datepicker.ui-widget-content a { color: #333333; }*/ 
     64.ui-datepicker .ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } 
     65.ui-datepicker .ui-widget-header a { color: #ffffff; } 
    6666 
    6767/* Interaction states 
    6868----------------------------------*/ 
    69 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } 
    70 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; } 
    71 .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; } 
    72 .ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; } 
    73 .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; } 
    74 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; } 
    75 .ui-widget :active { outline: none; } 
     69.ui-datepicker .ui-state-default, .ui-datepicker .ui-widget-content .ui-state-default, .ui-datepicker .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } 
     70.ui-datepicker .ui-state-default a, .ui-datepicker .ui-state-default a:link, .ui-datepicker .ui-state-default a:visited { color: #1c94c4; text-decoration: none; } 
     71.ui-datepicker .ui-state-hover, .ui-datepicker .ui-widget-content .ui-state-hover, .ui-datepicker .ui-widget-header .ui-state-hover, .ui-datepicker .ui-state-focus, .ui-datepicker .ui-widget-content .ui-state-focus, .ui-datepicker .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; } 
     72.ui-datepicker .ui-state-hover a, .ui-datepicker .ui-state-hover a:hover { color: #c77405; text-decoration: none; } 
     73.ui-datepicker .ui-state-active, .ui-datepicker .ui-widget-content .ui-state-active, .ui-datepicker .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; } 
     74.ui-datepicker .ui-state-active a, .ui-datepicker .ui-state-active a:link, .ui-datepicker .ui-state-active a:visited { color: #eb8f00; text-decoration: none; } 
     75.ui-datepicker .ui-widget :active { outline: none; } 
    7676 
    7777/* Interaction Cues 
    7878----------------------------------*/ 
    79 .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } 
    80 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } 
    81 .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } 
    82 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; } 
    83 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; } 
    84 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } 
    85 .ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } 
    86 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } 
     79.ui-datepicker .ui-state-highlight, .ui-datepicker .ui-widget-content .ui-state-highlight, .ui-datepicker .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } 
     80.ui-datepicker .ui-state-highlight a, .ui-datepicker .ui-widget-content .ui-state-highlight a, .ui-datepicker .ui-widget-header .ui-state-highlight a { color: #363636; } 
     81.ui-datepicker .ui-state-error, .ui-datepicker .ui-widget-content .ui-state-error, .ui-datepicker .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } 
     82.ui-datepicker .ui-state-error a, .ui-datepicker .ui-widget-content .ui-state-error a, .ui-datepicker .ui-widget-header .ui-state-error a { color: #ffffff; } 
     83.ui-datepicker .ui-state-error-text, .ui-datepicker .ui-widget-content .ui-state-error-text, .ui-datepicker .ui-widget-header .ui-state-error-text { color: #ffffff; } 
     84.ui-datepicker .ui-priority-primary, .ui-datepicker .ui-widget-content .ui-priority-primary, .ui-datepicker .ui-widget-header .ui-priority-primary { font-weight: bold; } 
     85.ui-datepicker .ui-priority-secondary, .ui-datepicker .ui-widget-content .ui-priority-secondary, .ui-datepicker .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } 
     86.ui-datepicker .ui-state-disabled, .ui-datepicker .ui-widget-content .ui-state-disabled, .ui-datepicker .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } 
    8787 
    8888/* Icons 
    8989----------------------------------*/ 
    9090 
     91.ui-datepicker .ui-icon-circle-triangle-e { background-position: -48px -192px; } 
     92.ui-datepicker .ui-icon-circle-triangle-s { background-position: -64px -192px; } 
     93.ui-datepicker .ui-icon-circle-triangle-w { background-position: -80px -192px; } 
     94.ui-datepicker .ui-icon-circle-triangle-n { background-position: -96px -192px; } 
     95 
    9196/* states and images */ 
    92 .ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } 
    93 .ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } 
    94 .ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } 
    95 .ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); } 
    96 .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } 
    97 .ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } 
    98 .ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); } 
    99 .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); } 
    100  
    101 /* positioning */ 
    102 .ui-icon-carat-1-n { background-position: 0 0; } 
    103 .ui-icon-carat-1-ne { background-position: -16px 0; } 
    104 .ui-icon-carat-1-e { background-position: -32px 0; } 
    105 .ui-icon-carat-1-se { background-position: -48px 0; } 
    106 .ui-icon-carat-1-s { background-position: -64px 0; } 
    107 .ui-icon-carat-1-sw { background-position: -80px 0; } 
    108 .ui-icon-carat-1-w { background-position: -96px 0; } 
    109 .ui-icon-carat-1-nw { background-position: -112px 0; } 
    110 .ui-icon-carat-2-n-s { background-position: -128px 0; } 
    111 .ui-icon-carat-2-e-w { background-position: -144px 0; } 
    112 .ui-icon-triangle-1-n { background-position: 0 -16px; } 
    113 .ui-icon-triangle-1-ne { background-position: -16px -16px; } 
    114 .ui-icon-triangle-1-e { background-position: -32px -16px; } 
    115 .ui-icon-triangle-1-se { background-position: -48px -16px; } 
    116 .ui-icon-triangle-1-s { background-position: -64px -16px; } 
    117 .ui-icon-triangle-1-sw { background-position: -80px -16px; } 
    118 .ui-icon-triangle-1-w { background-position: -96px -16px; } 
    119 .ui-icon-triangle-1-nw { background-position: -112px -16px; } 
    120 .ui-icon-triangle-2-n-s { background-position: -128px -16px; } 
    121 .ui-icon-triangle-2-e-w { background-position: -144px -16px; } 
    122 .ui-icon-arrow-1-n { background-position: 0 -32px; } 
    123 .ui-icon-arrow-1-ne { background-position: -16px -32px; } 
    124 .ui-icon-arrow-1-e { background-position: -32px -32px; } 
    125 .ui-icon-arrow-1-se { background-position: -48px -32px; } 
    126 .ui-icon-arrow-1-s { background-position: -64px -32px; } 
    127 .ui-icon-arrow-1-sw { background-position: -80px -32px; } 
    128 .ui-icon-arrow-1-w { background-position: -96px -32px; } 
    129 .ui-icon-arrow-1-nw { background-position: -112px -32px; } 
    130 .ui-icon-arrow-2-n-s { background-position: -128px -32px; } 
    131 .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } 
    132 .ui-icon-arrow-2-e-w { background-position: -160px -32px; } 
    133 .ui-icon-arrow-2-se-nw { background-position: -176px -32px; } 
    134 .ui-icon-arrowstop-1-n { background-position: -192px -32px; } 
    135 .ui-icon-arrowstop-1-e { background-position: -208px -32px; } 
    136 .ui-icon-arrowstop-1-s { background-position: -224px -32px; } 
    137 .ui-icon-arrowstop-1-w { background-position: -240px -32px; } 
    138 .ui-icon-arrowthick-1-n { background-position: 0 -48px; } 
    139 .ui-icon-arrowthick-1-ne { background-position: -16px -48px; } 
    140 .ui-icon-arrowthick-1-e { background-position: -32px -48px; } 
    141 .ui-icon-arrowthick-1-se { background-position: -48px -48px; } 
    142 .ui-icon-arrowthick-1-s { background-position: -64px -48px; } 
    143 .ui-icon-arrowthick-1-sw { background-position: -80px -48px; } 
    144 .ui-icon-arrowthick-1-w { background-position: -96px -48px; } 
    145 .ui-icon-arrowthick-1-nw { background-position: -112px -48px; } 
    146 .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } 
    147 .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } 
    148 .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } 
    149 .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } 
    150 .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } 
    151 .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } 
    152 .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } 
    153 .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } 
    154 .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } 
    155 .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } 
    156 .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } 
    157 .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } 
    158 .ui-icon-arrowreturn-1-w { background-position: -64px -64px; } 
    159 .ui-icon-arrowreturn-1-n { background-position: -80px -64px; } 
    160 .ui-icon-arrowreturn-1-e { background-position: -96px -64px; } 
    161 .ui-icon-arrowreturn-1-s { background-position: -112px -64px; } 
    162 .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } 
    163 .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } 
    164 .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } 
    165 .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } 
    166 .ui-icon-arrow-4 { background-position: 0 -80px; } 
    167 .ui-icon-arrow-4-diag { background-position: -16px -80px; } 
    168 .ui-icon-extlink { background-position: -32px -80px; } 
    169 .ui-icon-newwin { background-position: -48px -80px; } 
    170 .ui-icon-refresh { background-position: -64px -80px; } 
    171 .ui-icon-shuffle { background-position: -80px -80px; } 
    172 .ui-icon-transfer-e-w { background-position: -96px -80px; } 
    173 .ui-icon-transferthick-e-w { background-position: -112px -80px; } 
    174 .ui-icon-folder-collapsed { background-position: 0 -96px; } 
    175 .ui-icon-folder-open { background-position: -16px -96px; } 
    176 .ui-icon-document { background-position: -32px -96px; } 
    177 .ui-icon-document-b { background-position: -48px -96px; } 
    178 .ui-icon-note { background-position: -64px -96px; } 
    179 .ui-icon-mail-closed { background-position: -80px -96px; } 
    180 .ui-icon-mail-open { background-position: -96px -96px; } 
    181 .ui-icon-suitcase { background-position: -112px -96px; } 
    182 .ui-icon-comment { background-position: -128px -96px; } 
    183 .ui-icon-person { background-position: -144px -96px; } 
    184 .ui-icon-print { background-position: -160px -96px; } 
    185 .ui-icon-trash { background-position: -176px -96px; } 
    186 .ui-icon-locked { background-position: -192px -96px; } 
    187 .ui-icon-unlocked { background-position: -208px -96px; } 
    188 .ui-icon-bookmark { background-position: -224px -96px; } 
    189 .ui-icon-tag { background-position: -240px -96px; } 
    190 .ui-icon-home { background-position: 0 -112px; } 
    191 .ui-icon-flag { background-position: -16px -112px; } 
    192 .ui-icon-calendar { background-position: -32px -112px; } 
    193 .ui-icon-cart { background-position: -48px -112px; } 
    194 .ui-icon-pencil { background-position: -64px -112px; } 
    195 .ui-icon-clock { background-position: -80px -112px; } 
    196 .ui-icon-disk { background-position: -96px -112px; } 
    197 .ui-icon-calculator { background-position: -112px -112px; } 
    198 .ui-icon-zoomin { background-position: -128px -112px; } 
    199 .ui-icon-zoomout { background-position: -144px -112px; } 
    200 .ui-icon-search { background-position: -160px -112px; } 
    201 .ui-icon-wrench { background-position: -176px -112px; } 
    202 .ui-icon-gear { background-position: -192px -112px; } 
    203 .ui-icon-heart { background-position: -208px -112px; } 
    204 .ui-icon-star { background-position: -224px -112px; } 
    205 .ui-icon-link { background-position: -240px -112px; } 
    206 .ui-icon-cancel { background-position: 0 -128px; } 
    207 .ui-icon-plus { background-position: -16px -128px; } 
    208 .ui-icon-plusthick { background-position: -32px -128px; } 
    209 .ui-icon-minus { background-position: -48px -128px; } 
    210 .ui-icon-minusthick { background-position: -64px -128px; } 
    211 .ui-icon-close { background-position: -80px -128px; } 
    212 .ui-icon-closethick { background-position: -96px -128px; } 
    213 .ui-icon-key { background-position: -112px -128px; } 
    214 .ui-icon-lightbulb { background-position: -128px -128px; } 
    215 .ui-icon-scissors { background-position: -144px -128px; } 
    216 .ui-icon-clipboard { background-position: -160px -128px; } 
    217 .ui-icon-copy { background-position: -176px -128px; } 
    218 .ui-icon-contact { background-position: -192px -128px; } 
    219 .ui-icon-image { background-position: -208px -128px; } 
    220 .ui-icon-video { background-position: -224px -128px; } 
    221 .ui-icon-script { background-position: -240px -128px; } 
    222 .ui-icon-alert { background-position: 0 -144px; } 
    223 .ui-icon-info { background-position: -16px -144px; } 
    224 .ui-icon-notice { background-position: -32px -144px; } 
    225 .ui-icon-help { background-position: -48px -144px; } 
    226 .ui-icon-check { background-position: -64px -144px; } 
    227 .ui-icon-bullet { background-position: -80px -144px; } 
    228 .ui-icon-radio-off { background-position: -96px -144px; } 
    229 .ui-icon-radio-on { background-position: -112px -144px; } 
    230 .ui-icon-pin-w { background-position: -128px -144px; } 
    231 .ui-icon-pin-s { background-position: -144px -144px; } 
    232 .ui-icon-play { background-position: 0 -160px; } 
    233 .ui-icon-pause { background-position: -16px -160px; } 
    234 .ui-icon-seek-next { background-position: -32px -160px; } 
    235 .ui-icon-seek-prev { background-position: -48px -160px; } 
    236 .ui-icon-seek-end { background-position: -64px -160px; } 
    237 .ui-icon-seek-start { background-position: -80px -160px; } 
    238 /* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ 
    239 .ui-icon-seek-first { background-position: -80px -160px; } 
    240 .ui-icon-stop { background-position: -96px -160px; } 
    241 .ui-icon-eject { background-position: -112px -160px; } 
    242 .ui-icon-volume-off { background-position: -128px -160px; } 
    243 .ui-icon-volume-on { background-position: -144px -160px; } 
    244 .ui-icon-power { background-position: 0 -176px; } 
    245 .ui-icon-signal-diag { background-position: -16px -176px; } 
    246 .ui-icon-signal { background-position: -32px -176px; } 
    247 .ui-icon-battery-0 { background-position: -48px -176px; } 
    248 .ui-icon-battery-1 { background-position: -64px -176px; } 
    249 .ui-icon-battery-2 { background-position: -80px -176px; } 
    250 .ui-icon-battery-3 { background-position: -96px -176px; } 
    251 .ui-icon-circle-plus { background-position: 0 -192px; } 
    252 .ui-icon-circle-minus { background-position: -16px -192px; } 
    253 .ui-icon-circle-close { background-position: -32px -192px; } 
    254 .ui-icon-circle-triangle-e { background-position: -48px -192px; } 
    255 .ui-icon-circle-triangle-s { background-position: -64px -192px; } 
    256 .ui-icon-circle-triangle-w { background-position: -80px -192px; } 
    257 .ui-icon-circle-triangle-n { background-position: -96px -192px; } 
    258 .ui-icon-circle-arrow-e { background-position: -112px -192px; } 
    259 .ui-icon-circle-arrow-s { background-position: -128px -192px; } 
    260 .ui-icon-circle-arrow-w { background-position: -144px -192px; } 
    261 .ui-icon-circle-arrow-n { background-position: -160px -192px; } 
    262 .ui-icon-circle-zoomin { background-position: -176px -192px; } 
    263 .ui-icon-circle-zoomout { background-position: -192px -192px; } 
    264 .ui-icon-circle-check { background-position: -208px -192px; } 
    265 .ui-icon-circlesmall-plus { background-position: 0 -208px; } 
    266 .ui-icon-circlesmall-minus { background-position: -16px -208px; } 
    267 .ui-icon-circlesmall-close { background-position: -32px -208px; } 
    268 .ui-icon-squaresmall-plus { background-position: -48px -208px; } 
    269 .ui-icon-squaresmall-minus { background-position: -64px -208px; } 
    270 .ui-icon-squaresmall-close { background-position: -80px -208px; } 
    271 .ui-icon-grip-dotted-vertical { background-position: 0 -224px; } 
    272 .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } 
    273 .ui-icon-grip-solid-vertical { background-position: -32px -224px; } 
    274 .ui-icon-grip-solid-horizontal { background-position: -48px -224px; } 
    275 .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } 
    276 .ui-icon-grip-diagonal-se { background-position: -80px -224px; } 
    277  
     97.ui-datepicker .ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } 
     98.ui-datepicker .ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } 
     99.ui-datepicker .ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } 
     100.ui-datepicker .ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); } 
     101.ui-datepicker .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } 
     102.ui-datepicker .ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } 
     103.ui-datepicker .ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); } 
     104.ui-datepicker .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); } 
    278105 
    279106/* Misc visuals 
     
    281108 
    282109/* Corner radius */ 
    283 .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } 
    284 .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } 
    285 .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } 
    286 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } 
     110.ui-datepicker .ui-corner-all, .ui-datepicker .ui-corner-top, .ui-datepicker .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } 
     111.ui-datepicker .ui-corner-all, .ui-datepicker .ui-corner-top, .ui-corner-right, .ui-datepicker .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } 
     112.ui-datepicker .ui-corner-all, .ui-datepicker .ui-corner-bottom, .ui-datepicker .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } 
     113.ui-datepicker .ui-corner-all, .ui-datepicker .ui-corner-bottom, .ui-datepicker .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } 
    287114 
    288115/* Overlays */ 
    289 .ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } 
    290 .ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* 
     116.ui-datepicker .ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } 
     117.ui-datepicker .ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* 
    291118 * jQuery UI Datepicker 1.8.14 
    292119 * 
  • types/trunk/embedded/common/toolset-forms/js/conditional.js

    r970205 r973824  
    22 * @see WPToolset_Forms_Conditional (classes/conditional.php) 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/js/conditional.js $ 
    5  * $LastChangedDate: 2014-08-11 18:56:29 +0800 (Mon, 11 Aug 2014) $ 
    6  * $LastChangedRevision: 25838 $ 
    7  * $LastChangedBy: juan $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/js/conditional.js $ 
     5 * $LastChangedDate: 2014-08-26 20:11:43 +0800 (Tue, 26 Aug 2014) $ 
     6 * $LastChangedRevision: 26450 $ 
     7 * $LastChangedBy: francesco $ 
    88 * 
    99 */ 
     
    161161                var $trigger_checked = $trigger.filter(':checked'); 
    162162                // If no checkbox was checked, the value should be empty 
    163                 val = ''; 
    164                 if ( $trigger_checked.length == 1 ) { 
     163                val = ''; 
     164                //added data-value checking in order to fix 
     165                //https://icanlocalize.basecamphq.com/projects/7393061-toolset/todo_items/188528502/comments 
     166                if ( $trigger_checked.length == 1 ) {                     
     167                    val = ($trigger_checked.attr('data-value'))?$trigger_checked.attr('data-value'):$trigger_checked.val(); 
     168                } else if ( $trigger_checked.length > 1 ) { 
     169                        val = []; 
     170                        $trigger_checked.each(function() {                                             
     171                                val.push(($(this).attr('data-value'))?$(this).attr('data-value'):$(this).val()); 
     172                        }); 
     173                } 
     174                //######################################################################################### 
     175                break; 
     176            case 'file': 
     177                    var $trigger_checked = $trigger.filter(':not([disabled])'); 
    165178                    val = $trigger_checked.val(); 
    166                 } else if ( $trigger_checked.length > 1 ) { 
    167                     val = []; 
    168                     $trigger_checked.each(function() { 
    169                         val.push($(this).val()); 
    170                     }); 
    171                 } 
    172                 break; 
    173             case 'file': 
    174                 var $trigger_checked = $trigger.filter(':not([disabled])'); 
    175                 val = $trigger_checked.val(); 
    176                 break; 
     179                    break; 
    177180            default: 
    178181                val = $trigger.val(); 
  • types/trunk/embedded/common/toolset-forms/js/repetitive.js

    r970205 r973824  
    22 * Repetitive JS. 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/js/repetitive.js $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/js/repetitive.js $ 
    55 * $LastChangedDate: 2014-08-06 22:48:27 +0800 (Wed, 06 Aug 2014) $ 
    66 * $LastChangedRevision: 25705 $ 
  • types/trunk/embedded/common/toolset-forms/js/validation.js

    r970205 r973824  
    88 * @see class WPToolset_Validation 
    99 * 
    10  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/js/validation.js $ 
    11  * $LastChangedDate: 2014-08-14 19:14:45 +0800 (Thu, 14 Aug 2014) $ 
    12  * $LastChangedRevision: 25974 $ 
     10 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/js/validation.js $ 
     11 * $LastChangedDate: 2014-08-26 20:34:10 +0800 (Tue, 26 Aug 2014) $ 
     12 * $LastChangedRevision: 26451 $ 
    1313 * $LastChangedBy: francesco $ 
    1414 * 
     
    115115                    _rule[rule] = value.args; 
    116116                    if (value.message !== 'undefined') { 
    117                         _rule.messages[rule] = value.message; 
     117                        _rule.messages[rule] = value.message;                         
    118118                    } 
    119119                    element.rules('add', _rule); 
  • types/trunk/embedded/common/toolset-forms/templates/metaform-item.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/templates/metaform-item.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/templates/metaform-item.php $ 
    55 * $LastChangedDate: 2014-08-06 00:49:11 +0800 (Wed, 06 Aug 2014) $ 
    66 * $LastChangedRevision: 25660 $ 
  • types/trunk/embedded/common/toolset-forms/templates/metaform.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/august-release/toolset-forms/templates/metaform.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/common/tags/Views-1.6.3-CRED-1.3.1-Types-1.6.1/toolset-forms/templates/metaform.php $ 
    55 * $LastChangedDate: 2014-08-18 23:18:52 +0800 (Mon, 18 Aug 2014) $ 
    66 * $LastChangedRevision: 26059 $ 
  • types/trunk/embedded/frontend.php

    r970205 r973824  
    33 * Frontend functions. 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/frontend.php $ 
    6  * $LastChangedDate: 2014-07-16 17:38:37 +0800 (Wed, 16 Jul 2014) $ 
    7  * $LastChangedRevision: 24999 $ 
    8  * $LastChangedBy: emerson $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/frontend.php $ 
     6 * $LastChangedDate: 2014-08-27 10:22:08 +0800 (Wed, 27 Aug 2014) $ 
     7 * $LastChangedRevision: 26468 $ 
     8 * $LastChangedBy: bruce $ 
    99 * 
    1010 */ 
     
    247247    // To make sure 
    248248    if ( is_string( $params['field_value'] ) ) { 
    249         $params['field_value'] = esc_attr($params['field_value'] ); 
     249        if( $field && $field['type'] == 'textarea' ) { 
     250            $params['field_value'] = esc_attr($params['field_value'] ); 
     251        } else { 
     252            $params['field_value'] = addslashes( stripslashes( strval( $params['field_value'] ) ) ); 
     253        } 
    250254    } 
    251255 
     
    255259            if ((isset($field['data']['repetitive'])) && ($field['data']['repetitive'])) { 
    256260                //Repetitive fields, used meta ID for proper string translation unique identification 
    257                 $params['field_value'] = wpcf_translate( 'field ' . $field['id'] . ' value '.$meta_id, $params['field_value'] ); 
     261                $params['field_value'] = addslashes( wpcf_translate( 'field ' . $field['id'] . ' value '.$meta_id, $params['field_value'] ) ); 
    258262            } else { 
    259263                //Non-repetitive fields, use post ID 
    260                 $params['field_value'] = wpcf_translate( 'field ' . $field['id'] . ' value '.$post->ID, $params['field_value'] ); 
     264                $params['field_value'] = addslashes( wpcf_translate( 'field ' . $field['id'] . ' value '.$post->ID, $params['field_value'] ) ); 
    261265            } 
    262266        } 
     
    265269                         
    266270            //Repetitive fields, used meta ID for proper string translation unique identification 
    267             $params['field_value'] = wpcf_translate( 'field ' . $field['id'] . ' value '.$meta_id, $params['field_value'] ); 
     271            $params['field_value'] = addslashes( wpcf_translate( 'field ' . $field['id'] . ' value '.$meta_id, $params['field_value'] ) ); 
    268272             
    269273        } else { 
    270274            //Non-repetitive fields, use post ID 
    271             $params['field_value'] = wpcf_translate( 'field ' . $field['id'] . ' value '.$post->ID, $params['field_value'] ); 
     275            $params['field_value'] = addslashes( wpcf_translate( 'field ' . $field['id'] . ' value '.$post->ID, $params['field_value'] ) ); 
    272276        } 
    273277    } 
     
    321325            } 
    322326        } 
     327 
    323328    // Apply filters 
    324329    $output = strval( apply_filters( 'types_view', $output, 
  • types/trunk/embedded/includes/custom-types.php

    r970205 r973824  
    44 * Custom Post Types embedded code. 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/custom-types.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/custom-types.php $ 
    77 * $LastChangedDate: 2014-05-08 21:13:42 +0800 (Thu, 08 May 2014) $ 
    88 * $LastChangedRevision: 22156 $ 
  • types/trunk/embedded/includes/fields/audio.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/fields/audio.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/fields/audio.php $ 
    55 * $LastChangedDate: 2014-07-15 22:18:54 +0800 (Tue, 15 Jul 2014) $ 
    66 * $LastChangedRevision: 24974 $ 
  • types/trunk/embedded/includes/fields/checkboxes.php

    r970205 r973824  
    203203        } 
    204204        $output = implode( array_values( $params['field_value'] ), $separator ); 
    205         return empty( $output ) ? '__wpcf_skip_empty' : $output; 
     205        return empty( $output ) ? '__wpcf_skip_empty' : stripslashes($output); 
    206206    } 
    207207 
     
    232232        if ( $params['state'] == 'checked' 
    233233                && $option['value'] != '__wpcf_unchecked' ) { 
    234             return $content; 
     234            return srtipslashes($content); 
    235235        } else if ( $params['state'] == 'unchecked' 
    236236                && $option['value'] == '__wpcf_unchecked' ) { 
     
    250250     * Only set if it matches settings. 
    251251     * Otherwise leave empty and '__wpcf_skip_empty' will be returned. 
     252     * 
    252253     */ 
    253     if ( $option['data']['display'] == 'db' ) { 
     254 
     255    if ( isset($option['data']) && $option['data']['display'] == 'db' ) { 
    254256        /* 
    255257         *  
     
    262264                    . ' option ' . $option['key'] . ' value', $output ); 
    263265        } 
    264     } else if ( $option['data']['display'] == 'value' ) { 
     266    } else if ( isset($option['data']) && $option['data']['display'] == 'value' ) { 
    265267        /* 
    266268         *  
  • types/trunk/embedded/includes/fields/image.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/fields/image.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/fields/image.php $ 
    55 * $LastChangedDate: 2014-07-15 22:18:54 +0800 (Tue, 15 Jul 2014) $ 
    66 * $LastChangedRevision: 24974 $ 
  • types/trunk/embedded/includes/fields/radio.php

    r804241 r973824  
    145145    if ( isset( $params['option'] ) ) { 
    146146        foreach ( $field['data']['options'] as $option_key => $option ) { 
    147             if ( isset( $option['value'] ) 
    148                     && $option['value'] == $params['field_value'] 
     147            if ( isset( $option['value'] ) ) { 
     148                $test_val = stripslashes( strval( $option['value'] ) ); 
     149                if ($test_val == $params['field_value'] 
    149150                    && $option_key == $params['option'] ) { 
    150                 return htmlspecialchars_decode( $params['#content'] ); 
     151 
     152                    return htmlspecialchars_decode($params['#content']); 
     153                } 
    151154            } 
    152155        } 
     
    159162        foreach ( $field['data']['options'] as $option_key => $option ) { 
    160163            if ( isset( $option['value'] ) 
    161                     && $option['value'] == $params['field_value'] ) { 
     164                    && stripslashes( $option['value'] )  == stripslashes( $params['field_value'] ) ) { 
    162165                $field_value = wpcf_translate( 'field ' . $params['field']['id'] . ' option ' 
    163166                        . $option_key . ' title', $option['title'] ); 
     
    173176        $output = $field_value; 
    174177    } 
    175     return $output; 
     178 
     179    return   $output; 
    176180} 
  • types/trunk/embedded/includes/fields/skype.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/fields/skype.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/fields/skype.php $ 
    55 * $LastChangedDate: 2014-08-06 18:57:47 +0800 (Wed, 06 Aug 2014) $ 
    66 * $LastChangedRevision: 25691 $ 
  • types/trunk/embedded/includes/fields/textarea.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/fields/textarea.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/fields/textarea.php $ 
    55 * $LastChangedDate: 2014-06-20 23:24:06 +0800 (Fri, 20 Jun 2014) $ 
    66 * $LastChangedRevision: 24053 $ 
  • types/trunk/embedded/includes/fields/video.php

    r970205 r973824  
    22/** 
    33 * 
    4  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/fields/video.php $ 
     4 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/fields/video.php $ 
    55 * $LastChangedDate: 2014-07-15 22:18:54 +0800 (Tue, 15 Jul 2014) $ 
    66 * $LastChangedRevision: 24974 $ 
  • types/trunk/embedded/includes/module-manager.php

    r970205 r973824  
    55 * Since Types 1.2 
    66 * 
    7  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/includes/module-manager.php $ 
     7 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/includes/module-manager.php $ 
    88 * $LastChangedDate: 2014-08-20 16:58:50 +0800 (Wed, 20 Aug 2014) $ 
    99 * $LastChangedRevision: 26208 $ 
  • types/trunk/embedded/includes/wpml.php

    r970205 r973824  
    161161        return $string; 
    162162    } 
    163     return icl_t( $context, $name, esc_attr( $string ) ); 
     163    return icl_t( $context, $name, stripslashes( $string ) ); 
    164164} 
    165165 
  • types/trunk/embedded/resources/css/dashicons.css

    r970205 r973824  
    11/** 
    22 * 
    3  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/resources/css/dashicons.css $ 
     3 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/resources/css/dashicons.css $ 
    44 * $LastChangedDate: 2014-05-08 21:13:42 +0800 (Thu, 08 May 2014) $ 
    55 * $LastChangedRevision: 22156 $ 
  • types/trunk/embedded/resources/js/basic.js

    r970205 r973824  
    55 * Before moving full-version-only code - make sure it's not needed here. 
    66 * 
    7  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/resources/js/basic.js $ 
     7 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/resources/js/basic.js $ 
    88 * $LastChangedDate: 2014-07-25 21:32:06 +0800 (Fri, 25 Jul 2014) $ 
    99 * $LastChangedRevision: 25296 $ 
  • types/trunk/embedded/resources/js/fields-form.js

    r970205 r973824  
    1010 * @autor srdjan 
    1111 * 
    12  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/resources/js/fields-form.js $ 
     12 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/resources/js/fields-form.js $ 
    1313 * $LastChangedDate: 2014-07-11 12:20:46 +0800 (Fri, 11 Jul 2014) $ 
    1414 * $LastChangedRevision: 24859 $ 
  • types/trunk/embedded/usermeta-init.php

    r970205 r973824  
    1111 * @since Types 1.3 
    1212 * 
    13  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/embedded/usermeta-init.php $ 
     13 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/embedded/usermeta-init.php $ 
    1414 * $LastChangedDate: 2014-08-13 15:33:58 +0800 (Wed, 13 Aug 2014) $ 
    1515 * $LastChangedRevision: 25902 $ 
  • types/trunk/includes/custom-taxonomies-form.php

    r970205 r973824  
    44 * Custom taxonomies form 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/custom-taxonomies-form.php $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/custom-taxonomies-form.php $ 
    77 * $LastChangedDate: 2014-05-08 21:13:42 +0800 (Thu, 08 May 2014) $ 
    88 * $LastChangedRevision: 22156 $ 
  • types/trunk/includes/fields-control.php

    r970205 r973824  
    33 * Custom Fields Control Screen 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/fields-control.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/fields-control.php $ 
    66 * $LastChangedDate: 2014-06-26 18:57:18 +0800 (Thu, 26 Jun 2014) $ 
    77 * $LastChangedRevision: 24376 $ 
  • types/trunk/includes/fields.php

    r970205 r973824  
    33 * Fields and groups functions 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/fields.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/fields.php $ 
    66 * $LastChangedDate: 2014-07-10 23:25:28 +0800 (Thu, 10 Jul 2014) $ 
    77 * $LastChangedRevision: 24854 $ 
  • types/trunk/includes/import-export.php

    r970205 r973824  
    33 * Import/export data. 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/import-export.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/import-export.php $ 
    66 * $LastChangedDate: 2014-08-01 12:46:07 +0800 (Fri, 01 Aug 2014) $ 
    77 * $LastChangedRevision: 25533 $ 
  • types/trunk/includes/usermeta-control.php

    r970205 r973824  
    33 * Custom Fields Control Screen 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/usermeta-control.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/usermeta-control.php $ 
    66 * $LastChangedDate: 2014-06-26 18:57:18 +0800 (Thu, 26 Jun 2014) $ 
    77 * $LastChangedRevision: 24376 $ 
  • types/trunk/includes/usermeta-form.php

    r970205 r973824  
    33 * Fields and groups form functions. 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/includes/usermeta-form.php $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/includes/usermeta-form.php $ 
    66 * $LastChangedDate: 2014-08-14 10:10:16 +0800 (Thu, 14 Aug 2014) $ 
    77 * $LastChangedRevision: 25956 $ 
  • types/trunk/readme.txt

    r970205 r973824  
    66Requires at least: 3.4 
    77Tested up to: 4.0 
    8 Stable tag: 1.6 
     8Stable tag: 1.6.1 
    99 
    1010The complete and reliable plugin for managing custom post types, custom taxonomy and custom fields. 
     
    151151 
    152152== Changelog == 
     153 
     154= 1.6.1 = 
     155 
     156* Fix Formfactory::createForm and Formfactory::displayForm errors on some systems 
     157* Fix anonymous function problem with wysiwyg field 
     158* Fix datepicker.css so it only styles the datepicker popup 
     159* Fix escaping problems with the Types shortcode 
    153160 
    154161= 1.6 = 
  • types/trunk/resources/js/basic.js

    r970205 r973824  
    44 * Before moving from embedded JS - make sure it's needed only here. 
    55 * 
    6  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/resources/js/basic.js $ 
     6 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/resources/js/basic.js $ 
    77 * $LastChangedDate: 2014-07-04 18:19:40 +0800 (Fri, 04 Jul 2014) $ 
    88 * $LastChangedRevision: 24633 $ 
  • types/trunk/resources/js/custom-types-form.js

    r970205 r973824  
    33 * Custom Types form JS 
    44 * 
    5  * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6/resources/js/custom-types-form.js $ 
     5 * $HeadURL: https://www.onthegosystems.com/misc_svn/cck/tags/1.6.1/resources/js/custom-types-form.js $ 
    66 * $LastChangedDate: 2014-05-13 18:49:25 +0800 (Tue, 13 May 2014) $ 
    77 * $LastChangedRevision: 22267 $ 
  • types/trunk/wpcf.php

    r970205 r973824  
    66  Author: OnTheGoSystems 
    77  Author URI: http://www.onthegosystems.com 
    8   Version: 1.6 
     8  Version: 1.6.1 
    99 */ 
    1010/** 
     
    2121     * make sure that WPCF_VERSION in embedded/bootstrap.php is the same! 
    2222     */ 
    23     define( 'WPCF_VERSION', '1.6' ); 
     23    define( 'WPCF_VERSION', '1.6.1' ); 
    2424} 
    2525 
Note: See TracChangeset for help on using the changeset viewer.