@@ -107,14 +107,14 @@ |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | switch($input_type) { |
| 110 | - case 'fileupload': |
|
| 111 | - $value = self::preview_image_value("input_{$field['id']}", $field, $form, $lead); |
|
| 112 | - $value = self::preview_image_display($field, $form, $value); |
|
| 113 | - break; |
|
| 114 | - default: |
|
| 115 | - $value = self::preview_image_value("input_{$field['id']}", $field, $form, $lead); |
|
| 116 | - $value = GFCommon::get_lead_field_display($field, $value, $currency); |
|
| 117 | - break; |
|
| 110 | + case 'fileupload': |
|
| 111 | + $value = self::preview_image_value("input_{$field['id']}", $field, $form, $lead); |
|
| 112 | + $value = self::preview_image_display($field, $form, $value); |
|
| 113 | + break; |
|
| 114 | + default: |
|
| 115 | + $value = self::preview_image_value("input_{$field['id']}", $field, $form, $lead); |
|
| 116 | + $value = GFCommon::get_lead_field_display($field, $value, $currency); |
|
| 117 | + break; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | return $value; |
@@ -46,8 +46,9 @@ discard block |
||
| 46 | 46 | foreach($form['fields'] as &$field) { |
| 47 | 47 | |
| 48 | 48 | // skip all fields on the first page |
| 49 | - if(rgar($field, 'pageNumber') <= 1) |
|
| 50 | - continue; |
|
| 49 | + if(rgar($field, 'pageNumber') <= 1) { |
|
| 50 | + continue; |
|
| 51 | + } |
|
| 51 | 52 | |
| 52 | 53 | $default_value = rgar($field, 'defaultValue'); |
| 53 | 54 | preg_match_all('/{.+}/', $default_value, $matches, PREG_SET_ORDER); |
@@ -61,8 +62,9 @@ discard block |
||
| 61 | 62 | } |
| 62 | 63 | |
| 63 | 64 | // only run 'content' filter for fields on the current page |
| 64 | - if(rgar($field, 'pageNumber') != $current_page) |
|
| 65 | - continue; |
|
| 65 | + if(rgar($field, 'pageNumber') != $current_page) { |
|
| 66 | + continue; |
|
| 67 | + } |
|
| 66 | 68 | |
| 67 | 69 | $html_content = rgar($field, 'content'); |
| 68 | 70 | preg_match_all('/{.+}/', $html_content, $matches, PREG_SET_ORDER); |
@@ -81,8 +83,9 @@ discard block |
||
| 81 | 83 | public static function preview_special_merge_tags($value, $input_id, $merge_tag, $field) { |
| 82 | 84 | |
| 83 | 85 | // added to prevent overriding :noadmin filter (and other filters that remove fields) |
| 84 | - if( ! $value ) |
|
| 85 | - return $value; |
|
| 86 | + if( ! $value ) { |
|
| 87 | + return $value; |
|
| 88 | + } |
|
| 86 | 89 | |
| 87 | 90 | $input_type = RGFormsModel::get_input_type($field); |
| 88 | 91 | |
@@ -90,12 +93,14 @@ discard block |
||
| 90 | 93 | $is_multi_input = is_array( rgar($field, 'inputs') ); |
| 91 | 94 | $is_input = intval( $input_id ) != $input_id; |
| 92 | 95 | |
| 93 | - if( !$is_upload_field && !$is_multi_input ) |
|
| 94 | - return $value; |
|
| 96 | + if( !$is_upload_field && !$is_multi_input ) { |
|
| 97 | + return $value; |
|
| 98 | + } |
|
| 95 | 99 | |
| 96 | 100 | // if is individual input of multi-input field, return just that input value |
| 97 | - if(!$is_input ) |
|
| 98 | - return $value; |
|
| 101 | + if(!$is_input ) { |
|
| 102 | + return $value; |
|
| 103 | + } |
|
| 99 | 104 | |
| 100 | 105 | $form = RGFormsModel::get_form_meta($field['formId']); |
| 101 | 106 | $lead = self::create_lead($form); |
@@ -126,8 +131,9 @@ discard block |
||
| 126 | 131 | $file_info = RGFormsModel::get_temp_filename($form['id'], $input_name); |
| 127 | 132 | $source = RGFormsModel::get_upload_url($form['id']) . "/tmp/" . $file_info["temp_filename"]; |
| 128 | 133 | |
| 129 | - if(!$file_info) |
|
| 130 | - return ''; |
|
| 134 | + if(!$file_info) { |
|
| 135 | + return ''; |
|
| 136 | + } |
|
| 131 | 137 | |
| 132 | 138 | switch(RGFormsModel::get_input_type($field)){ |
| 133 | 139 | |
@@ -192,12 +198,14 @@ discard block |
||
| 192 | 198 | |
| 193 | 199 | public static function clear_field_value_cache( $form ) { |
| 194 | 200 | |
| 195 | - if( ! class_exists( 'GFCache' ) ) |
|
| 196 | - return; |
|
| 201 | + if( ! class_exists( 'GFCache' ) ) { |
|
| 202 | + return; |
|
| 203 | + } |
|
| 197 | 204 | |
| 198 | 205 | foreach( $form['fields'] as &$field ) { |
| 199 | - if( GFFormsModel::get_input_type( $field ) == 'total' ) |
|
| 200 | - GFCache::delete( 'GFFormsModel::get_lead_field_value__' . $field['id'] ); |
|
| 206 | + if( GFFormsModel::get_input_type( $field ) == 'total' ) { |
|
| 207 | + GFCache::delete( 'GFFormsModel::get_lead_field_value__' . $field['id'] ); |
|
| 208 | + } |
|
| 201 | 209 | } |
| 202 | 210 | |
| 203 | 211 | } |