Plugin Directory

Changeset 1506733


Ignore:
Timestamp:
10/02/2016 09:42:00 AM (9 years ago)
Author:
entr
Message:

Releasing v1.0.1

Location:
gravity-forms-upload-rules/trunk
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed
  • gravity-forms-upload-rules/trunk

    • Property svn:ignore set to

  • gravity-forms-upload-rules/trunk/gforms-uploadrules.php

    r785512 r1506733  
    33class GFUploadRules {
    44
    5   protected static $version = '1.0';
    6 
    7     public function localize() {
     5    protected static $version = '1.0.1';
     6
     7    public static function localize() {
    88
    99        $locale = apply_filters( 'plugin_locale', get_locale(), 'gforms_uprules' );
     
    1212    }
    1313
    14     public function register_scripts() {
     14    public static function register_scripts() {
    1515        wp_register_script('gform_uprules_plugin_form_editor', plugins_url('/js/form_editor.js', __FILE__), array('jquery'), self::$version, true );
    1616    }
    1717
    18     public function editor_js() {
    19 
    20         if ( ! in_array( 'gform_uprules_plugin_form_editor', wp_print_scripts(array('gform_uprules_plugin_form_editor')) ) ) :
    21     ?>
    22     <script type="text/javascript" id="gform_uprules_plugin_form_editor">
    23     <?php include plugin_dir_path( __FILE__ ) . 'js/form_editor.js'; ?>
    24     </script>
    25     <?php
    26     endif;
    27     }
    28 
    29   public function dimension_field_label_minwidth() {
    30 
    31     $locale = apply_filters( 'plugin_locale', get_locale(), 'gforms_uprules' );
    32     $label_minwidth_by_locale = apply_filters( 'gforms_uprules_dimension_field_label_minwidth', array( 'en_US' => 50 ) );
    33 
    34     if ( isset( $label_minwidth_by_locale[ $locale ] ) )
    35       return $label_minwidth_by_locale[ $locale ];
    36 
    37     //in case somebody has messed things up
    38     return 50;
    39   }
    40 
    41     public function field_settings( $position ) {
    42         if ( 200 != $position )
     18    public static function editor_js() {
     19
     20        if ( ! in_array( 'gform_uprules_plugin_form_editor', wp_print_scripts(array('gform_uprules_plugin_form_editor')) ) ) : ?>
     21            <script type="text/javascript" id="gform_uprules_plugin_form_editor">
     22            <?php include plugin_dir_path( __FILE__ ) . 'js/form_editor.js'; ?>
     23            </script>
     24            <?php
     25        endif;
     26    }
     27
     28    public static function dimension_field_label_minwidth() {
     29
     30        $locale = apply_filters( 'plugin_locale', get_locale(), 'gforms_uprules' );
     31        $label_minwidth_by_locale = apply_filters( 'gforms_uprules_dimension_field_label_minwidth', array( 'en_US' => 50 ) );
     32
     33        if ( isset( $label_minwidth_by_locale[ $locale ] ) ) {
     34            return $label_minwidth_by_locale[ $locale ];
     35        }
     36
     37        //in case somebody has messed things up
     38        return 50;
     39    }
     40
     41    public static function field_settings( $position ) {
     42        if ( 200 != $position ) {
    4343            return;
    44 
    45     $label_minwidth = self::dimension_field_label_minwidth();
     44        }
     45
     46        $label_minwidth = self::dimension_field_label_minwidth();
    4647        ?>
    4748        <li class="uprules_filesize_setting field_setting">
    48             <label for="field_uprules_filesize">
     49            <label for="field_uprules_filesize" class="section_label">
    4950                <?php _e("Filesize Limit", "gforms_uprules"); ?>
    50         <?php gform_tooltip("form_field_uprules_filesize"); ?>
     51                <?php gform_tooltip("form_field_uprules_filesize"); ?>
    5152            </label>
    5253            <input type="text" id="field_uprules_filesize" style="text-align: right;" onkeyup="SetFieldProperty('uprules_filesize_limit', this.value);" size="10" />
    53             <select id="field_uprules_filesize_dim" onchange="SetFieldProperty('uprules_filesize_dim', jQuery(this).val() );"><option value="kb">KB</option><option value="mb">MB</option></select>
     54            <select id="field_uprules_filesize_dim" style="margin: 0;" onchange="SetFieldProperty('uprules_filesize_dim', jQuery(this).val() );"><option value="kb">KB</option><option value="mb">MB</option></select>
    5455        </li>
    55     <li class="uprules_dimensions_setting field_setting">
    56       <label>
    57         <?php _e("Image dimensions", "gforms_uprules"); ?>
    58 
    59         <select id="field_uprules_dims_ruletype" onchange="SetFieldProperty('uprules_dims_ruletype', jQuery(this).val() );">
    60           <option value="" style="text-align: center"><?php _e("&ndash; Select &ndash;", "gforms_uprules"); ?></option>
    61           <option value="exact"><?php _e("Exact", "gforms_uprules"); ?></option>
    62           <option value="conditional"><?php _e("Conditional", "gforms_uprules"); ?></option>
    63         </select>
    64 
    65         <?php gform_tooltip("form_field_uprules_dimensions"); ?>
    66 
    67       </label>
    68 
    69       <div class="uprules_dims_fields_exact" style="display: none;">
    70         <div>
    71           <label for="uprules_dims_exact_width" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
    72             <?php _e("Width", "gforms_uprules"); ?>
    73           </label>
    74           <input type="text" id="field_uprules_dims_exact_width" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_exact_width', this.value);" size="6" />
    75         </div>
    76         <div>
    77           <label for="uprules_dims_exact_height" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
    78             <?php _e("Height", "gforms_uprules"); ?>
    79           </label>
    80           <input type="text" id="field_uprules_dims_exact_height" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_exact_height', this.value);" size="6" />
    81         </div>
    82       </div> <!--//-- .uprules_dims_fields_exact -->
    83 
    84       <div class="uprules_dims_fields_conditional" style="display: none;">
    85         <div class="uprules_dims_fields_conditional_min">
    86           <label for="uprules_dims_minwidth" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
    87             <?php _e("Min", "gforms_uprules"); ?>
    88           </label>
    89           <input type="text" id="field_uprules_dims_minwidth" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_minwidth', this.value);" size="6" placeholder="<?php esc_attr_e("Width", "gforms_uprules"); ?>" />
    90           &times;
    91           <input type="text" id="field_uprules_dims_minheight" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_minheight', this.value);" size="6" placeholder="<?php esc_attr_e("Height", "gforms_uprules"); ?>" />
    92         </div>
    93         <div class="uprules_dims_fields_conditional_max">
    94           <label for="uprules_dims_maxwidth" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
    95             <?php _e("Max", "gforms_uprules"); ?>
    96           </label>
    97           <input type="text" id="field_uprules_dims_maxwidth" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_maxwidth', this.value);" size="6" placeholder="<?php esc_attr_e("Width", "gforms_uprules"); ?>" />
    98           &times;
    99           <input type="text" id="field_uprules_dims_maxheight" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_maxheight', this.value);" size="6" placeholder="<?php esc_attr_e("Height", "gforms_uprules"); ?>" />
    100         </div>
    101       </div> <!--//-- .uprules_dims_fields_conditional -->
    102 
    103     </li>
     56        <li class="uprules_dimensions_setting field_setting">
     57            <label class="section_label">
     58            <?php _e("Image dimensions", "gforms_uprules"); ?>
     59
     60            <select id="field_uprules_dims_ruletype" style="margin: 0;" onchange="SetFieldProperty('uprules_dims_ruletype', jQuery(this).val() );">
     61                <option value="" style="text-align: center"><?php _e("&ndash; Select &ndash;", "gforms_uprules"); ?></option>
     62                <option value="exact"><?php _e("Exact", "gforms_uprules"); ?></option>
     63                <option value="conditional"><?php _e("Conditional", "gforms_uprules"); ?></option>
     64            </select>
     65
     66            <?php gform_tooltip("form_field_uprules_dimensions"); ?>
     67            </label>
     68
     69            <div class="uprules_dims_fields_exact" style="display: none;">
     70                <div>
     71                    <label for="uprules_dims_exact_width" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
     72                    <?php _e("Width", "gforms_uprules"); ?>
     73                    </label>
     74                    <input type="text" id="field_uprules_dims_exact_width" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_exact_width', this.value);" size="6" />
     75                </div>
     76                <div>
     77                    <label for="uprules_dims_exact_height" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
     78                    <?php _e("Height", "gforms_uprules"); ?>
     79                    </label>
     80                    <input type="text" id="field_uprules_dims_exact_height" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_exact_height', this.value);" size="6" />
     81                </div>
     82            </div> <!--//-- .uprules_dims_fields_exact -->
     83
     84            <div class="uprules_dims_fields_conditional" style="display: none;">
     85                <div class="uprules_dims_fields_conditional_min">
     86                    <label for="uprules_dims_minwidth" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
     87                    <?php _e("Min", "gforms_uprules"); ?>
     88                    </label>
     89                   
     90                    <input type="text" id="field_uprules_dims_minwidth" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_minwidth', this.value);" size="6" placeholder="<?php esc_attr_e("Width", "gforms_uprules"); ?>" />
     91                    &times;
     92                    <input type="text" id="field_uprules_dims_minheight" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_minheight', this.value);" size="6" placeholder="<?php esc_attr_e("Height", "gforms_uprules"); ?>" />
     93                </div>
     94                <div class="uprules_dims_fields_conditional_max">
     95                    <label for="uprules_dims_maxwidth" class="inline" style="min-width: <?php echo esc_attr( $label_minwidth ); ?>px; margin-right: 10px;">
     96                    <?php _e("Max", "gforms_uprules"); ?>
     97                    </label>
     98                    <input type="text" id="field_uprules_dims_maxwidth" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_maxwidth', this.value);" size="6" placeholder="<?php esc_attr_e("Width", "gforms_uprules"); ?>" />
     99                    &times;
     100                    <input type="text" id="field_uprules_dims_maxheight" style="text-align: center;" onkeyup="SetFieldProperty('uprules_dims_maxheight', this.value);" size="6" placeholder="<?php esc_attr_e("Height", "gforms_uprules"); ?>" />
     101                </div>
     102            </div> <!--//-- .uprules_dims_fields_conditional -->
     103
     104        </li>
    104105        <?php
    105106    }
    106107
    107   public function field_validation( $valid, $value, $form, $field ) {
    108     if ( ! empty( $_FILES ) && $valid['is_valid'] && in_array( RGFormsModel::get_input_type($field), array( 'fileupload', 'post_image' ) ) ) {
    109 
    110       $form_id = $form['id'];
    111       $input_name = 'input_' . $field['id'];
    112       $fileinfo = RGFormsModel::get_temp_filename( $form_id, $input_name );
    113       $temp_filepath = RGFormsModel::get_upload_path($form_id) . "/tmp/" . $fileinfo["temp_filename"];
    114 
    115       if ( isset( $_FILES[$input_name] ) && !empty( $_FILES[$input_name] ) )  {
    116         $bytes = $_FILES[$input_name]['size'];
    117         $dims = @getimagesize( $_FILES[$input_name]['tmp_name'] );
    118       }
    119       elseif ( file_exists( $temp_filepath ) ) {
    120         $bytes = filesize( $temp_filepath );
    121         $dims = @getimagesize( $temp_filepath );
    122       }
    123       else return $valid;
    124 
    125 
    126       //validate filesize
     108    public static function field_validation( $valid, $value, $form, $field ) {
     109
     110        if ( ! empty( $_FILES ) && $valid['is_valid'] && in_array( RGFormsModel::get_input_type($field), array( 'fileupload', 'post_image' ) ) ) {
     111
     112            $form_id = $form['id'];
     113            $input_name = 'input_' . $field['id'];
     114            $fileinfo = RGFormsModel::get_temp_filename( $form_id, $input_name );
     115            $temp_filepath = RGFormsModel::get_upload_path($form_id) . "/tmp/" . $fileinfo["temp_filename"];
     116
     117            if ( isset( $_FILES[$input_name] ) && !empty( $_FILES[$input_name] ) )  {
     118                $bytes = $_FILES[$input_name]['size'];
     119                $dims = @getimagesize( $_FILES[$input_name]['tmp_name'] );
     120            }
     121            elseif ( file_exists( $temp_filepath ) ) {
     122                $bytes = filesize( $temp_filepath );
     123                $dims = @getimagesize( $temp_filepath );
     124            }
     125            else {
     126                return $valid;
     127            }
     128
     129            //validate filesize
    127130            if ( isset( $field['uprules_filesize_limit'] ) ) {
    128131                $multipliers = array(
     
    130133                    'mb' => 1024 * 1024
    131134                );
     135
    132136                $max_filesize_user = intval( $field['uprules_filesize_limit'] );
    133137                $bytes_multiplier = $multipliers[$field['uprules_filesize_dim']];
     
    135139            }
    136140
    137       if ( isset( $bytes ) && $max_filesize_user > 0 && $max_filesize_bytes < $bytes ) {
    138         $valid['is_valid'] = false;
    139         $valid['message'] = sprintf( __( 'Max file upload size (%s) exceeded.', 'gravityforms' ), size_format( $max_filesize_bytes, 2 ) );
    140       }
    141       //validate image dimensions
    142       if ( $valid['is_valid'] && is_array( $dims ) && isset( $field['uprules_dims_ruletype'] ) && in_array( $field['uprules_dims_ruletype'], array( 'exact', 'conditional' ) ) ) {
    143         list( $up_width, $up_height ) = $dims;
    144         $valid = self::validate_image_dimensions( $field, $up_width, $up_height );
    145       }
    146 
    147       if ( ! $valid['is_valid'] )
    148         unset( RGFormsModel::$uploaded_files[$form_id][$input_name], $_FILES[$input_name] );
    149 
    150     }
    151     return $valid;
    152   }
    153 
    154   public function is_valid_dim( $val ) {
    155     return (bool)( trim($val) == absint( $val ) && $val > 0 );
    156   }
    157 
    158   public function validate_image_dimensions( $field, $width, $height ) {
    159 
    160     $valid = array( 'is_valid' => true, 'message' => '' );
    161     switch ( $field['uprules_dims_ruletype'] ) {
    162       case 'exact':
    163         if (
    164           isset( $field['uprules_dims_exact_width'] ) && self::is_valid_dim( $field['uprules_dims_exact_width'] ) && trim( $field['uprules_dims_exact_width'] ) != $width
    165           || isset( $field['uprules_dims_exact_height'] ) && self::is_valid_dim( $field['uprules_dims_exact_height'] ) && trim( $field['uprules_dims_exact_height'] ) != $height
    166         )
    167           $valid['is_valid'] = false;
    168           $valid['message'] = sprintf( __("Only images with dimensions %d&times;%d allowed.", "gforms_uprules"), $field['uprules_dims_exact_width'], $field['uprules_dims_exact_height'] );
    169         break;
    170       case 'conditional':
    171         $errors = "";
    172 
    173         if ( isset( $field['uprules_dims_minwidth'] ) && self::is_valid_dim( $field['uprules_dims_minwidth'] ) && trim( $field['uprules_dims_minwidth'] ) > $width ) {
    174           $valid['is_valid'] = false;
    175           $errors .= '<br/>' . sprintf( __("Min width: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_minwidth'] );
    176         }
    177         if ( isset( $field['uprules_dims_minheight'] ) && self::is_valid_dim( $field['uprules_dims_minheight'] ) && trim( $field['uprules_dims_minheight'] ) > $height ) {
    178           $valid['is_valid'] = false;
    179           $errors .= '<br/>' . sprintf( __("Min height: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_minheight'] );
    180         }
    181         if ( isset( $field['uprules_dims_maxwidth'] ) && self::is_valid_dim( $field['uprules_dims_maxwidth'] ) && trim( $field['uprules_dims_maxwidth'] ) < $width ) {
    182           $valid['is_valid'] = false;
    183           $errors .= '<br/>' . sprintf( __("Max width: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_maxwidth'] );
    184         }
    185         if ( isset( $field['uprules_dims_maxheight'] ) && self::is_valid_dim( $field['uprules_dims_maxheight'] ) && trim( $field['uprules_dims_maxheight'] ) < $height ) {
    186           $valid['is_valid'] = false;
    187           $errors .= '<br/>' . sprintf( __("Max height: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_maxheight'] );
    188         }
    189 
    190         if ( ! $valid['is_valid'] && ! empty( $errors ) )
    191           $valid['message'] = __("Image dimension didn't meet following size conditions:", "gforms_uprules") . $errors;
    192 
    193         break;
    194     }
    195     return $valid;
    196   }
    197 
    198   public function tooltips( $gf_tooltips ) {
    199     $gf_uprules_tooltips = array(
    200       'form_field_uprules_filesize' => "<h6>" . __("Filesize Limit", "gforms_uprules") . "</h6>" . __("Enter filesize limit for uploaded file. Exceeding uploads will be rejected with an error.", "gforms_uprules"),
    201       'form_field_uprules_dimensions' => "<h6>" . __("Image dimensions", "gforms_uprules") . "</h6>" . __("Set validation conditions for uploaded image. Choose between <i>Exact</i> or <i>Conditional</i> validation methods. Empty fields will be not checked against. All values are in <b>pixels</b>. Non-matching images will be rejected with an error.", "gforms_uprules")
    202     );
    203 
    204     return array_merge( $gf_uprules_tooltips, $gf_tooltips );
    205   }
    206 
    207     public function actions() {
    208     add_filter( 'gform_field_validation', array( __CLASS__, 'field_validation' ), 10, 4 );
     141            if ( isset( $bytes ) && isset( $max_filesize_bytes ) && $max_filesize_user > 0 && $max_filesize_bytes < $bytes ) {
     142                $valid['is_valid'] = false;
     143                $valid['message'] = sprintf( __( 'Max file upload size (%s) exceeded.', 'gravityforms' ), size_format( $max_filesize_bytes, 2 ) );
     144            }
     145
     146            //validate image dimensions
     147            if ( $valid['is_valid'] && is_array( $dims ) && isset( $field['uprules_dims_ruletype'] ) && in_array( $field['uprules_dims_ruletype'], array( 'exact', 'conditional' ) ) ) {
     148                list( $up_width, $up_height ) = $dims;
     149                $valid = self::validate_image_dimensions( $field, $up_width, $up_height );
     150            }
     151
     152            if ( ! $valid['is_valid'] ) {
     153                unset( RGFormsModel::$uploaded_files[$form_id][$input_name], $_FILES[$input_name] );
     154            }
     155        }
     156
     157        return $valid;
     158    }
     159
     160    public static function is_valid_dim( $val ) {
     161        return (bool)( trim($val) == absint( $val ) && $val > 0 );
     162    }
     163
     164    public static function validate_image_dimensions( $field, $width, $height ) {
     165
     166        $valid = array( 'is_valid' => true, 'message' => '' );
     167        switch ( $field['uprules_dims_ruletype'] ) {
     168            case 'exact':
     169                if (
     170                    isset( $field['uprules_dims_exact_width'] ) && self::is_valid_dim( $field['uprules_dims_exact_width'] ) && trim( $field['uprules_dims_exact_width'] ) != $width
     171                    || isset( $field['uprules_dims_exact_height'] ) && self::is_valid_dim( $field['uprules_dims_exact_height'] ) && trim( $field['uprules_dims_exact_height'] ) != $height
     172                )
     173                    $valid['is_valid'] = false;
     174                    $valid['message'] = sprintf( __("Only images with dimensions %d&times;%d allowed.", "gforms_uprules"), $field['uprules_dims_exact_width'], $field['uprules_dims_exact_height'] );
     175                break;
     176            case 'conditional':
     177                $errors = "";
     178
     179                if ( isset( $field['uprules_dims_minwidth'] ) && self::is_valid_dim( $field['uprules_dims_minwidth'] ) && trim( $field['uprules_dims_minwidth'] ) > $width ) {
     180                    $valid['is_valid'] = false;
     181                    $errors .= '<br/>' . sprintf( __("Min width: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_minwidth'] );
     182                }
     183                if ( isset( $field['uprules_dims_minheight'] ) && self::is_valid_dim( $field['uprules_dims_minheight'] ) && trim( $field['uprules_dims_minheight'] ) > $height ) {
     184                    $valid['is_valid'] = false;
     185                    $errors .= '<br/>' . sprintf( __("Min height: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_minheight'] );
     186                }
     187                if ( isset( $field['uprules_dims_maxwidth'] ) && self::is_valid_dim( $field['uprules_dims_maxwidth'] ) && trim( $field['uprules_dims_maxwidth'] ) < $width ) {
     188                    $valid['is_valid'] = false;
     189                    $errors .= '<br/>' . sprintf( __("Max width: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_maxwidth'] );
     190                }
     191                if ( isset( $field['uprules_dims_maxheight'] ) && self::is_valid_dim( $field['uprules_dims_maxheight'] ) && trim( $field['uprules_dims_maxheight'] ) < $height ) {
     192                    $valid['is_valid'] = false;
     193                    $errors .= '<br/>' . sprintf( __("Max height: <b>%dpx</b>", "gforms_uprules"), $field['uprules_dims_maxheight'] );
     194                }
     195
     196                if ( ! $valid['is_valid'] && ! empty( $errors ) ) {
     197                    $valid['message'] = __("Image dimension didn't meet following size conditions:", "gforms_uprules") . $errors;
     198                }
     199
     200            break;
     201        }
     202
     203        return $valid;
     204    }
     205
     206    public static function tooltips( $gf_tooltips ) {
     207        $gf_uprules_tooltips = array(
     208            'form_field_uprules_filesize' => "<h6>" . __("Filesize Limit", "gforms_uprules") . "</h6>" . __("Enter filesize limit for uploaded file. Exceeding uploads will be rejected with an error.", "gforms_uprules"),
     209            'form_field_uprules_dimensions' => "<h6>" . __("Image dimensions", "gforms_uprules") . "</h6>" . __("Set validation conditions for uploaded image. Choose between <i>Exact</i> or <i>Conditional</i> validation methods. Empty fields will be not checked against. All values are in <b>pixels</b>. Non-matching images will be rejected with an error.", "gforms_uprules")
     210        );
     211
     212        return array_merge( $gf_uprules_tooltips, $gf_tooltips );
     213    }
     214
     215    public static function actions() {
     216        add_filter( 'gform_field_validation', array( __CLASS__, 'field_validation' ), 10, 4 );
    209217        add_action( 'gform_field_advanced_settings', array( __CLASS__, 'field_settings' ), 5 );
    210218        add_action( 'gform_editor_js', array( __CLASS__, 'editor_js' ), 20 );
     
    213221        add_action( 'init', array( __CLASS__, 'localize' ) );
    214222    }
    215 
    216223}
    217224
  • gravity-forms-upload-rules/trunk/js/form_editor.js

    r768183 r1506733  
    11(function($,window,document,undefined) {
    2  
    3   function gforms_uprules_dims_ruletype_change( type ) {
    4    
    5     $('#field_uprules_dims_ruletype').val( type );
    6     switch( type ) {
    7       case 'exact':
    8         $('.uprules_dims_fields_exact').show();
    9         $('.uprules_dims_fields_conditional').hide();
    10         break;
    11       case 'conditional':
    12         $('.uprules_dims_fields_conditional').show();
    13         $('.uprules_dims_fields_exact').hide();
    14         break;
    15       default:
    16         $('.uprules_dims_fields_exact, .uprules_dims_fields_conditional').hide();
    17     }
    18   }
     2   
     3    function gforms_uprules_dims_ruletype_change( type ) {
     4       
     5        $('#field_uprules_dims_ruletype').val( type );
     6        switch( type ) {
     7            case 'exact':
     8                $('.uprules_dims_fields_exact').show();
     9                $('.uprules_dims_fields_conditional').hide();
     10                break;
     11            case 'conditional':
     12                $('.uprules_dims_fields_conditional').show();
     13                $('.uprules_dims_fields_exact').hide();
     14                break;
     15            default:
     16                $('.uprules_dims_fields_exact, .uprules_dims_fields_conditional').hide();
     17        }
     18    }
    1919
    2020    $(document).bind('gform_load_field_settings', function(e,field,form) {
    2121        $('#field_uprules_filesize').val(field.uprules_filesize_limit);
    2222        $('#field_uprules_filesize_dim').val(field.uprules_filesize_dim);
    23    
    24     $('#field_uprules_dims_exact_width').val( field.uprules_dims_exact_width );
    25     $('#field_uprules_dims_exact_height').val( field.uprules_dims_exact_height );
    26     $('#field_uprules_dims_minwidth').val( field.uprules_dims_minwidth );
    27     $('#field_uprules_dims_minheight').val( field.uprules_dims_minheight );
    28     $('#field_uprules_dims_maxwidth').val( field.uprules_dims_maxwidth );
    29     $('#field_uprules_dims_maxheight').val( field.uprules_dims_maxheight );
    30    
    31     gforms_uprules_dims_ruletype_change( field.uprules_dims_ruletype );
    32    
    33         /* found a better way to do it
    34         if ( $.inArray( field.type, ['post_image','fileupload'] ) > -1 ) {
    35             $('.uprules_filesize_setting, .uprules_dimensions_setting').show();
    36     }
    37         */
     23       
     24        $('#field_uprules_dims_exact_width').val( field.uprules_dims_exact_width );
     25        $('#field_uprules_dims_exact_height').val( field.uprules_dims_exact_height );
     26        $('#field_uprules_dims_minwidth').val( field.uprules_dims_minwidth );
     27        $('#field_uprules_dims_minheight').val( field.uprules_dims_minheight );
     28        $('#field_uprules_dims_maxwidth').val( field.uprules_dims_maxwidth );
     29        $('#field_uprules_dims_maxheight').val( field.uprules_dims_maxheight );
     30       
     31        gforms_uprules_dims_ruletype_change( field.uprules_dims_ruletype );
    3832    });
    39  
    40   $(function(){
    41    
    42         //$('#field_uprules_filesize_dim').triggerHandler('change');
    43     $('#field_uprules_dims_ruletype').change( function() { gforms_uprules_dims_ruletype_change( $(this).val() ); } );
    44   });
    45  
     33   
     34    $(function(){
     35       
     36        $('#field_uprules_dims_ruletype').change( function() { gforms_uprules_dims_ruletype_change( $(this).val() ); } );
     37    });
     38   
    4639    window.fieldSettings.fileupload += ', .uprules_filesize_setting, .uprules_dimensions_setting';
    4740    window.fieldSettings.post_image += ', .uprules_filesize_setting, .uprules_dimensions_setting';
    4841   
    49     if ( $.isFunction( window['SetDefaultValues_fileupload'] ) )
     42    if ( $.isFunction( window['SetDefaultValues_fileupload'] ) ) {
    5043        window['__SetDefaultValues_fileupload'] = window['SetDefaultValues_fileupload'];
     44    }
    5145       
    5246    window['SetDefaultValues_fileupload'] = function(field) {
     
    6054    };
    6155   
    62     if ( $.isFunction( window['SetDefaultValues_post_image'] ) )
     56    if ( $.isFunction( window['SetDefaultValues_post_image'] ) ) {
    6357        window['__SetDefaultValues_post_image'] = window['SetDefaultValues_post_image'];
     58    }
    6459       
    6560    window['SetDefaultValues_post_image'] = function(field) {
     
    7469    };
    7570   
    76    
    7771})(jQuery,window,document);
  • gravity-forms-upload-rules/trunk/plugin.php

    r768183 r1506733  
    44Plugin URI: http://zzlatev.com/gravity-forms-upload-limits/
    55Description: Adds extra upload rules to file/image Gravity Froms upload fields. You will be able to limit upload filesize and dimensions of uploaded images.
    6 Version: 1.0
     6Version: 1.0.1
    77Author: Zlatko Zlatev
    88Author URI: http://zzlatev.com/
  • gravity-forms-upload-rules/trunk/readme.txt

    r785513 r1506733  
    66Requires at least: 3.0
    77Tested up to: 3.6
    8 Stable tag: 1.0
     8Stable tag: 1.0.1
    99License: GPLv2 or later
    1010License URI: http://www.gnu.org/licenses/gpl-2.0.html
     
    1818= Upload Rules =
    1919This plugin attempts to fill gaps in Gravity Forms upload fields. It enables you to set file size and image size dimensions limitations to your upload fields - both file upload and image upload.
     20
     21For issues and pull requests please use the [GitHub repo](https://github.com/entr/gravity-forms-upload-rules).
    2022
    2123== Installation ==
     
    3739== Changelog ==
    3840
     41= 1.0.1 =
     42
     43* Proper static function declarations
     44* Tweak admin field styles for better compatability with recent GF versions
     45* Normalize line-endings and indentation
     46
    3947= 1.0 =
    4048
Note: See TracChangeset for help on using the changeset viewer.