Completed
Pull Request — master (#665)
by Zack
14:25 queued 10:40
created
includes/admin/metaboxes/views/view-settings.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package GravityView
4
- * @subpackage Gravityview/admin/metaboxes/views
5
- * @global $post
6
- */
3
+	 * @package GravityView
4
+	 * @subpackage Gravityview/admin/metaboxes/views
5
+	 * @global $post
6
+	 */
7 7
 global $post;
8 8
 
9 9
 $curr_form = gravityview_get_form_id( $post->ID );
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/widget-search.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Display the Search widget
4
- *
5
- * @see class-search-widget.php
6
- */
3
+			 * Display the Search widget
4
+			 *
5
+			 * @see class-search-widget.php
6
+			 */
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	do_action( 'gravityview_search_widget_fields_before', $this );
25 25
 
26
-	foreach( $this->search_fields as $search_field ) {
26
+	foreach ( $this->search_fields as $search_field ) {
27 27
 		$gravityview_view->search_field = $search_field;
28
-		$this->render( 'search-field', $search_field['input'], false );
28
+		$this->render( 'search-field', $search_field[ 'input' ], false );
29 29
 
30 30
 		// show/hide the search button if there are input type fields
31
-		if( !$has_inputs &&  $search_field['input'] != 'link' ) {
31
+		if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
32 32
 			$has_inputs = true;
33 33
 		}
34 34
 	}
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	do_action( 'gravityview_search_widget_fields_after', $this );
41 41
 
42
-	if( $has_inputs ) { ?>
42
+	if ( $has_inputs ) { ?>
43 43
 		<div class="gv-search-box gv-search-box-submit">
44 44
 			<?php
45 45
 
Please login to merge, or discard this patch.
includes/admin/class.field.type.php 3 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -158,6 +158,7 @@
 block discarded – undo
158 158
     /**
159 159
      * important! Override this class if needed
160 160
      * outputs the field setting html
161
+     * @param string $override_input
161 162
      */
162 163
     function render_setting( $override_input = NULL ) {
163 164
 
Please login to merge, or discard this patch.
Indentation   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -10,159 +10,159 @@  discard block
 block discarded – undo
10 10
 	 *
11 11
 	 * @var string
12 12
 	 */
13
-    protected $name;
13
+	protected $name;
14 14
 
15 15
 	/**
16 16
 	 * Field settings
17 17
 	 *
18 18
 	 * @var array
19 19
 	 */
20
-    protected $field;
20
+	protected $field;
21 21
 
22 22
 	/**
23 23
 	 * Field current value
24 24
 	 *
25 25
 	 * @var mixed
26 26
 	 */
27
-    protected $value;
28
-
29
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
30
-
31
-        $this->name = $name;
32
-
33
-        $defaults = self::get_field_defaults();
34
-
35
-        // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
39
-        }
40
-
41
-        $this->field =  wp_parse_args( $field, $defaults );
42
-
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
44
-
45
-    }
46
-
47
-    /**
48
-     * Returns the default details for a field option
49
-     *
50
-     * - default    // default option value, in case nothing is defined (@deprecated)
51
-     * - desc       // option description
52
-     * - value      // the option default value
53
-     * - label      // the option label
54
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
55
-     * - id         // the field id
56
-     * - type       // the option type ( text, checkbox, select, ... )
57
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
58
-     * - merge_tags // if the option supports merge tags feature
59
-     * - class      // (new) define extra classes for the field
60
-     * - tooltip    //
61
-     *
62
-     * @return array
63
-     */
64
-    public static function get_field_defaults() {
65
-        return array(
66
-            'desc' => '',
67
-            'value' => NULL,
68
-            'label' => '',
69
-            'left_label' => NULL,
70
-            'id' => NULL,
71
-            'type'  => 'text',
72
-            'options' => NULL,
73
-            'merge_tags' => true,
74
-            'class' => '',
75
-            'tooltip' => NULL
76
-        );
77
-    }
78
-
79
-
80
-    function get_tooltip() {
81
-        if( !function_exists('gform_tooltip') ) {
82
-            return NULL;
83
-        }
84
-
85
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
86
-    }
87
-
88
-    /**
89
-     * Build input id based on the name
90
-     * @return string
91
-     */
92
-    function get_field_id() {
93
-        if( isset( $this->field['id'] ) ) {
94
-            return esc_attr( $this->field['id'] );
95
-        }
96
-        return esc_attr( sanitize_html_class( $this->name ) );
97
-    }
98
-
99
-    /**
100
-     * Retrieve field label
101
-     * @return string
102
-     */
103
-    function get_field_label() {
104
-        return esc_html( trim( $this->field['label'] ) );
105
-    }
27
+	protected $value;
28
+
29
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
30
+
31
+		$this->name = $name;
32
+
33
+		$defaults = self::get_field_defaults();
34
+
35
+		// Backward compatibility
36
+		if( !empty( $field['choices'] ) ) {
37
+			$field['options'] = $field['choices'];
38
+			unset( $field['choices'] );
39
+		}
40
+
41
+		$this->field =  wp_parse_args( $field, $defaults );
42
+
43
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
44
+
45
+	}
46
+
47
+	/**
48
+	 * Returns the default details for a field option
49
+	 *
50
+	 * - default    // default option value, in case nothing is defined (@deprecated)
51
+	 * - desc       // option description
52
+	 * - value      // the option default value
53
+	 * - label      // the option label
54
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
55
+	 * - id         // the field id
56
+	 * - type       // the option type ( text, checkbox, select, ... )
57
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
58
+	 * - merge_tags // if the option supports merge tags feature
59
+	 * - class      // (new) define extra classes for the field
60
+	 * - tooltip    //
61
+	 *
62
+	 * @return array
63
+	 */
64
+	public static function get_field_defaults() {
65
+		return array(
66
+			'desc' => '',
67
+			'value' => NULL,
68
+			'label' => '',
69
+			'left_label' => NULL,
70
+			'id' => NULL,
71
+			'type'  => 'text',
72
+			'options' => NULL,
73
+			'merge_tags' => true,
74
+			'class' => '',
75
+			'tooltip' => NULL
76
+		);
77
+	}
78
+
79
+
80
+	function get_tooltip() {
81
+		if( !function_exists('gform_tooltip') ) {
82
+			return NULL;
83
+		}
84
+
85
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
86
+	}
87
+
88
+	/**
89
+	 * Build input id based on the name
90
+	 * @return string
91
+	 */
92
+	function get_field_id() {
93
+		if( isset( $this->field['id'] ) ) {
94
+			return esc_attr( $this->field['id'] );
95
+		}
96
+		return esc_attr( sanitize_html_class( $this->name ) );
97
+	}
98
+
99
+	/**
100
+	 * Retrieve field label
101
+	 * @return string
102
+	 */
103
+	function get_field_label() {
104
+		return esc_html( trim( $this->field['label'] ) );
105
+	}
106 106
 
107 107
 	/**
108 108
 	 * Retrieve field left label
109
-     *
110
-     * @since 1.7
111
-     *
109
+	 *
110
+	 * @since 1.7
111
+	 *
112 112
 	 * @return string
113 113
 	 */
114 114
 	function get_field_left_label() {
115 115
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
116 116
 	}
117 117
 
118
-    /**
119
-     * Retrieve field label class
120
-     * @return string
121
-     */
122
-    function get_label_class() {
123
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
124
-    }
125
-
126
-
127
-    /**
128
-     * Retrieve field description
129
-     * @return string
130
-     */
131
-    function get_field_desc() {
132
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
133
-    }
134
-
135
-
136
-    /**
137
-     * Verify if field should have merge tags
138
-     * @return boolean
139
-     */
140
-    function show_merge_tags() {
141
-        // Show the merge tags if the field is a list view
142
-        $is_list = preg_match( '/_list-/ism', $this->name );
143
-        // Or is a single entry view
144
-        $is_single = preg_match( '/single_/ism', $this->name );
145
-
146
-        return ( $is_single || $is_list );
147
-    }
148
-
149
-
150
-
151
-    /**
152
-     * important! Override this class
153
-     * outputs the field option html
154
-     */
155
-    function render_option() {
156
-        // to replace on each field
157
-    }
158
-
159
-    /**
160
-     * important! Override this class if needed
161
-     * outputs the field setting html
162
-     */
163
-    function render_setting( $override_input = NULL ) {
164
-
165
-        if( !empty( $this->field['full_width'] ) ) { ?>
118
+	/**
119
+	 * Retrieve field label class
120
+	 * @return string
121
+	 */
122
+	function get_label_class() {
123
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
124
+	}
125
+
126
+
127
+	/**
128
+	 * Retrieve field description
129
+	 * @return string
130
+	 */
131
+	function get_field_desc() {
132
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
133
+	}
134
+
135
+
136
+	/**
137
+	 * Verify if field should have merge tags
138
+	 * @return boolean
139
+	 */
140
+	function show_merge_tags() {
141
+		// Show the merge tags if the field is a list view
142
+		$is_list = preg_match( '/_list-/ism', $this->name );
143
+		// Or is a single entry view
144
+		$is_single = preg_match( '/single_/ism', $this->name );
145
+
146
+		return ( $is_single || $is_list );
147
+	}
148
+
149
+
150
+
151
+	/**
152
+	 * important! Override this class
153
+	 * outputs the field option html
154
+	 */
155
+	function render_option() {
156
+		// to replace on each field
157
+	}
158
+
159
+	/**
160
+	 * important! Override this class if needed
161
+	 * outputs the field setting html
162
+	 */
163
+	function render_setting( $override_input = NULL ) {
164
+
165
+		if( !empty( $this->field['full_width'] ) ) { ?>
166 166
             <th scope="row" colspan="2">
167 167
                 <div>
168 168
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -182,14 +182,14 @@  discard block
 block discarded – undo
182 182
             </td>
183 183
         <?php }
184 184
 
185
-    }
185
+	}
186 186
 
187
-    /**
188
-     * important! Override this class
189
-     * outputs the input html part
190
-     */
191
-    function render_input( $override_input ) {
192
-        echo '';
193
-    }
187
+	/**
188
+	 * important! Override this class
189
+	 * outputs the input html part
190
+	 */
191
+	function render_input( $override_input ) {
192
+		echo '';
193
+	}
194 194
 
195 195
 }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
         $defaults = self::get_field_defaults();
34 34
 
35 35
         // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
36
+        if ( ! empty( $field[ 'choices' ] ) ) {
37
+        	$field[ 'options' ] = $field[ 'choices' ];
38
+        	unset( $field[ 'choices' ] );
39 39
         }
40 40
 
41
-        $this->field =  wp_parse_args( $field, $defaults );
41
+        $this->field = wp_parse_args( $field, $defaults );
42 42
 
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
43
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
44 44
 
45 45
     }
46 46
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 
79 79
 
80 80
     function get_tooltip() {
81
-        if( !function_exists('gform_tooltip') ) {
81
+        if ( ! function_exists( 'gform_tooltip' ) ) {
82 82
             return NULL;
83 83
         }
84 84
 
85
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
85
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . gform_tooltip( $this->field[ 'tooltip' ], false, true ) : NULL;
86 86
     }
87 87
 
88 88
     /**
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
      * @return string
91 91
      */
92 92
     function get_field_id() {
93
-        if( isset( $this->field['id'] ) ) {
94
-            return esc_attr( $this->field['id'] );
93
+        if ( isset( $this->field[ 'id' ] ) ) {
94
+            return esc_attr( $this->field[ 'id' ] );
95 95
         }
96 96
         return esc_attr( sanitize_html_class( $this->name ) );
97 97
     }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
      * @return string
102 102
      */
103 103
     function get_field_label() {
104
-        return esc_html( trim( $this->field['label'] ) );
104
+        return esc_html( trim( $this->field[ 'label' ] ) );
105 105
     }
106 106
 
107 107
 	/**
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 * @return string
113 113
 	 */
114 114
 	function get_field_left_label() {
115
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
115
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
116 116
 	}
117 117
 
118 118
     /**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      * @return string
121 121
      */
122 122
     function get_label_class() {
123
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
123
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
124 124
     }
125 125
 
126 126
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
      * @return string
130 130
      */
131 131
     function get_field_desc() {
132
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
132
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
133 133
     }
134 134
 
135 135
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     function render_setting( $override_input = NULL ) {
164 164
 
165
-        if( !empty( $this->field['full_width'] ) ) { ?>
165
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
166 166
             <th scope="row" colspan="2">
167 167
                 <div>
168 168
                     <label for="<?php echo $this->get_field_id(); ?>">
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/shortcode-hint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package GravityView
4
- * @subpackage Gravityview/admin/metaboxes/partials
5
- * @global $post
6
- */
3
+	 * @package GravityView
4
+	 * @subpackage Gravityview/admin/metaboxes/partials
5
+	 * @global $post
6
+	 */
7 7
 
8 8
 global $post;
9 9
 ?>
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/single-entry.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package GravityView
4
- * @subpackage Gravityview/admin/metaboxes/views
5
- * @global $post
6
- */
3
+	 * @package GravityView
4
+	 * @subpackage Gravityview/admin/metaboxes/views
5
+	 * @global $post
6
+	 */
7 7
 global $post;
8 8
 
9 9
 $curr_form = gravityview_get_form_id( $post->ID );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-list.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 	 *
26 26
 	 * @param GF_Field_List $field Gravity Forms field
27 27
 	 * @param string|array $field_value Serialized or unserialized array value for the field
28
-	 * @param int|string $column_id The numeric key of the column (0-index) or the label of the column
28
+	 * @param integer $column_id The numeric key of the column (0-index) or the label of the column
29 29
 	 * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text`
30 30
 	 *
31 31
 	 * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 		$list_rows = maybe_unserialize( $field_value );
62 62
 
63
-		if( ! is_array( $list_rows ) ) {
63
+		if ( ! is_array( $list_rows ) ) {
64 64
 			do_action( 'gravityview_log_error', __METHOD__ . ' - $field_value did not unserialize', $field_value );
65 65
 			return null;
66 66
 		}
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
 			foreach ( $list_row as $column_key => $column_value ) {
74 74
 
75 75
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
76
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
77
-					$column_values[] = $column_value;
76
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
77
+					$column_values[ ] = $column_value;
78 78
 				}
79 79
 				$current_column++;
80 80
 			}
81 81
 		}
82 82
 
83 83
 		// Return the array of values
84
-		if( 'raw' === $format ) {
84
+		if ( 'raw' === $format ) {
85 85
 			return $column_values;
86 86
 		}
87 87
 		// Return the Gravity Forms Field output
@@ -104,22 +104,22 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function _filter_field_label( $label, $field, $form, $entry ) {
106 106
 
107
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
107
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
108 108
 
109 109
 		// Not a list field
110
-		if( ! $field_object || 'list' !== $field_object->type ) {
110
+		if ( ! $field_object || 'list' !== $field_object->type ) {
111 111
 			return $label;
112 112
 		}
113 113
 
114 114
 		// Custom label is defined, so use it
115
-		if( ! empty( $field['custom_label'] ) ) {
115
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
116 116
 			return $label;
117 117
 		}
118 118
 
119
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
119
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
120 120
 
121 121
 		// Parent field, not column field
122
-		if( empty( $column_id ) ) {
122
+		if ( empty( $column_id ) ) {
123 123
 			return $label;
124 124
 		}
125 125
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
141 141
 
142 142
 		// Doesn't have columns enabled
143
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
143
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
144 144
 			return $backup_label;
145 145
 		}
146 146
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 				 */
228 228
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $content, $gravityview_view->getCurrentField() );
229 229
 
230
-                $content = gravityview_get_link( $link, $content, $link_atts );
230
+				$content = gravityview_get_link( $link, $content, $link_atts );
231 231
 			}
232 232
 
233 233
 			$output_arr[] = array(
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@  discard block
 block discarded – undo
20 20
 
21 21
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
22 22
 
23
-		unset( $field_options['search_filter'] );
23
+		unset( $field_options[ 'search_filter' ] );
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
29
-		$add_options['link_to_file'] = array(
29
+		$add_options[ 'link_to_file' ] = array(
30 30
 			'type' => 'checkbox',
31 31
 			'label' => __( 'Display as a Link:', 'gravityview' ),
32
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
32
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
33 33
 			'value' => false,
34 34
 			'merge_tags' => false,
35 35
 		);
@@ -59,22 +59,22 @@  discard block
 block discarded – undo
59 59
 		$output_arr = array();
60 60
 
61 61
 		// Get an array of file paths for the field.
62
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
62
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
63 63
 
64 64
 		// Process each file path
65
-		foreach( $file_paths as $file_path ) {
65
+		foreach ( $file_paths as $file_path ) {
66 66
 
67 67
 			// If the site is HTTPS, use HTTPS
68
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme($file_path); }
68
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
69 69
 
70 70
 			// This is from Gravity Forms's code
71
-			$file_path = esc_attr(str_replace(" ", "%20", $file_path));
71
+			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
72 72
 
73 73
 			// If the field is set to link to the single entry, link to it.
74
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
74
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
75 75
 
76 76
 			// Get file path information
77
-			$file_path_info = pathinfo($file_path);
77
+			$file_path_info = pathinfo( $file_path );
78 78
 
79 79
 			$html_format = NULL;
80 80
 
@@ -83,30 +83,30 @@  discard block
 block discarded – undo
83 83
 			$disable_wrapped_link = false;
84 84
 
85 85
 			// Is this an image?
86
-			$image = new GravityView_Image(array(
86
+			$image = new GravityView_Image( array(
87 87
 				'src' => $file_path,
88
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
89
-				'alt' => $field_settings['label'],
90
-				'width' => (gravityview_get_context() === 'single' ? NULL : 250)
91
-			));
88
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
89
+				'alt' => $field_settings[ 'label' ],
90
+				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
91
+			) );
92 92
 
93 93
 			$content = $image->html();
94 94
 
95 95
 			// The new default content is the image, if it exists. If not, use the file name as the content.
96
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
96
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
97 97
 
98 98
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
99
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
99
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
100 100
 
101 101
 
102
-			switch( true ) {
102
+			switch ( true ) {
103 103
 
104 104
 				// Audio file
105 105
 				case in_array( $extension, wp_get_audio_extensions() ):
106 106
 
107 107
 					$disable_lightbox = true;
108 108
 
109
-					if( shortcode_exists( 'audio' ) ) {
109
+					if ( shortcode_exists( 'audio' ) ) {
110 110
 
111 111
 						$disable_wrapped_link = true;
112 112
 
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
 						 */
118 118
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
119 119
 							'src' => $file_path,
120
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
121
-						));
120
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
121
+						) );
122 122
 
123 123
 						/**
124 124
 						 * Generate the audio shortcode
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
 					$disable_lightbox = true;
138 138
 
139
-					if( shortcode_exists( 'video' ) ) {
139
+					if ( shortcode_exists( 'video' ) ) {
140 140
 
141 141
 						$disable_wrapped_link = true;
142 142
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 						 */
148 148
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
149 149
 							'src' => $file_path,
150
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
151
-						));
150
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
151
+						) );
152 152
 
153 153
 						/**
154 154
 						 * Generate the video shortcode
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 					break;
171 171
 
172 172
 				// if not image, do not set the lightbox (@since 1.5.3)
173
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
173
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
174 174
 
175 175
 					$disable_lightbox = true;
176 176
 
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
 
181 181
 			// If using Link to File, override the content.
182 182
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
183
-			if( !empty( $field_settings['link_to_file'] ) ) {
183
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
184 184
 
185 185
 				// Force the content to be the file name
186
-				$content =  $file_path_info["basename"];
186
+				$content = $file_path_info[ "basename" ];
187 187
 
188 188
 				// Restore the wrapped link
189 189
 				$disable_wrapped_link = false;
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
 			}
192 192
 
193 193
 			// Whether to use lightbox or not
194
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
194
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
195 195
 
196
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
196
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
197 197
 
198 198
 			} else {
199 199
 
200 200
 				$link_atts = array(
201
-					'rel' => sprintf( "%s-%s", $gv_class, $entry['id'] ),
201
+					'rel' => sprintf( "%s-%s", $gv_class, $entry[ 'id' ] ),
202 202
 					'target' => '_blank',
203 203
 					'class' => 'thickbox',
204 204
 				);
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
223 223
 
224 224
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
225
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
225
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
226 226
 
227 227
 				/**
228 228
 				 * Modify the link text (defaults to the file name)
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                 $content = gravityview_get_link( $link, $content, $link_atts );
238 238
 			}
239 239
 
240
-			$output_arr[] = array(
240
+			$output_arr[ ] = array(
241 241
 				'file_path' => $file_path,
242 242
 				'content' => $content
243 243
 			);
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-textarea.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
22 22
 		);
23 23
 
24
-        $field_options['make_clickable'] = array(
25
-            'type' => 'checkbox',
26
-            'merge_tags' => false,
27
-            'value' => 0,
28
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
29
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
30
-        );
24
+		$field_options['make_clickable'] = array(
25
+			'type' => 'checkbox',
26
+			'merge_tags' => false,
27
+			'value' => 0,
28
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
29
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
30
+		);
31 31
 
32 32
 		return $field_options;
33 33
 	}
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
 
26 26
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$field_options['trim_words'] = array(
32
+		$field_options[ 'trim_words' ] = array(
33 33
 			'type' => 'number',
34 34
 			'merge_tags' => false,
35 35
 			'value' => null,
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
38 38
 		);
39 39
 
40
-        $field_options['make_clickable'] = array(
40
+        $field_options[ 'make_clickable' ] = array(
41 41
             'type' => 'checkbox',
42 42
             'merge_tags' => false,
43 43
             'value' => 0,
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -255,7 +255,6 @@
 block discarded – undo
255 255
 	 * Get the default date format for a field based on the field ID and the time format setting
256 256
 	 *
257 257
 	 * @since 1.14
258
-
259 258
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
260 259
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
261 260
 	 *
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
61 61
 
62
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
62
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
63 63
 	}
64 64
 
65 65
 	/**
@@ -100,31 +100,31 @@  discard block
 block discarded – undo
100 100
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
101 101
 
102 102
 		// If the search is being sorted
103
-		if( ! empty( $criteria['sorting']['key'] ) ) {
103
+		if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
104 104
 
105
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
105
+			$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
106 106
 
107 107
 			/**
108 108
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
109 109
 			 * @see modify_sort_id()
110 110
 			 */
111
-			if( ! empty( $pieces[1] ) ) {
111
+			if ( ! empty( $pieces[ 1 ] ) ) {
112 112
 
113 113
 				// Pass these to the _modify_query_sort_by_time_hack() method
114
-				$this->_time_format = $pieces[1];
115
-				$this->_date_format = $pieces[2];
114
+				$this->_time_format = $pieces[ 1 ];
115
+				$this->_date_format = $pieces[ 2 ];
116 116
 
117 117
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
118
-				$criteria['sorting']['key'] = floor( $pieces[0] );
118
+				$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
119 119
 
120 120
 				/**
121 121
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
122 122
 				 * @see GVCommon::is_field_numeric() is_numeric should also be set here
123 123
 				 */
124
-				$criteria['sorting']['is_numeric'] = true;
124
+				$criteria[ 'sorting' ][ 'is_numeric' ] = true;
125 125
 
126 126
 				// Modify the Gravity Forms WP Query
127
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
127
+				add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
128 128
 			}
129 129
 		}
130 130
 
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
 		 * then we want to modify the query.
148 148
 		 * @see GFFormsModel::sort_by_field_query()
149 149
 		 */
150
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
150
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
151 151
 
152
-			if( $this->_time_format === '24' ) {
152
+			if ( $this->_time_format === '24' ) {
153 153
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
154 154
 			} else {
155 155
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -195,18 +195,18 @@  discard block
 block discarded – undo
195 195
 		// Set variables
196 196
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
197 197
 
198
-		if( 'edit' === $context ) {
198
+		if ( 'edit' === $context ) {
199 199
 			return $field_options;
200 200
 		}
201 201
 
202 202
 		/**
203 203
 		 * Set default date format based on field ID and Form ID
204 204
 		 */
205
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
205
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
206 206
 
207
-		$this->add_field_support('date_display', $field_options );
207
+		$this->add_field_support( 'date_display', $field_options );
208 208
 
209
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
209
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
210 210
 
211 211
 		return $field_options;
212 212
 	}
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	private function _get_time_format() {
222 222
 		global $post;
223 223
 
224
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
224
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
225 225
 
226 226
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
227 227
 	}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 		// GF defaults to 12, so should we.
241 241
 		$time_format = '12';
242 242
 
243
-		if( $form_id ) {
243
+		if ( $form_id ) {
244 244
 			$form = GFAPI::get_form( $form_id );
245 245
 
246 246
 			if ( $form ) {
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 		$default = 'h:i A';
288 288
 
289 289
 		// This doesn't take into account 24-hour
290
-		switch( $field_input_id ) {
290
+		switch ( $field_input_id ) {
291 291
 			// Hours
292 292
 			case 1:
293 293
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.