Completed
Pull Request — master (#1008)
by Zack
36:04 queued 16:03
created
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.
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.
Indentation   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -10,160 +10,160 @@  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
-            'requires' => NULL
77
-        );
78
-    }
79
-
80
-
81
-    function get_tooltip() {
82
-        if( !function_exists('gform_tooltip') ) {
83
-            return NULL;
84
-        }
85
-
86
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
87
-    }
88
-
89
-    /**
90
-     * Build input id based on the name
91
-     * @return string
92
-     */
93
-    function get_field_id() {
94
-        if( isset( $this->field['id'] ) ) {
95
-            return esc_attr( $this->field['id'] );
96
-        }
97
-        return esc_attr( sanitize_html_class( $this->name ) );
98
-    }
99
-
100
-    /**
101
-     * Retrieve field label
102
-     * @return string
103
-     */
104
-    function get_field_label() {
105
-        return esc_html( trim( $this->field['label'] ) );
106
-    }
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
+			'requires' => NULL
77
+		);
78
+	}
79
+
80
+
81
+	function get_tooltip() {
82
+		if( !function_exists('gform_tooltip') ) {
83
+			return NULL;
84
+		}
85
+
86
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
87
+	}
88
+
89
+	/**
90
+	 * Build input id based on the name
91
+	 * @return string
92
+	 */
93
+	function get_field_id() {
94
+		if( isset( $this->field['id'] ) ) {
95
+			return esc_attr( $this->field['id'] );
96
+		}
97
+		return esc_attr( sanitize_html_class( $this->name ) );
98
+	}
99
+
100
+	/**
101
+	 * Retrieve field label
102
+	 * @return string
103
+	 */
104
+	function get_field_label() {
105
+		return esc_html( trim( $this->field['label'] ) );
106
+	}
107 107
 
108 108
 	/**
109 109
 	 * Retrieve field left label
110
-     *
111
-     * @since 1.7
112
-     *
110
+	 *
111
+	 * @since 1.7
112
+	 *
113 113
 	 * @return string
114 114
 	 */
115 115
 	function get_field_left_label() {
116 116
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
117 117
 	}
118 118
 
119
-    /**
120
-     * Retrieve field label class
121
-     * @return string
122
-     */
123
-    function get_label_class() {
124
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
125
-    }
126
-
127
-
128
-    /**
129
-     * Retrieve field description
130
-     * @return string
131
-     */
132
-    function get_field_desc() {
133
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
134
-    }
135
-
136
-
137
-    /**
138
-     * Verify if field should have merge tags
139
-     * @return boolean
140
-     */
141
-    function show_merge_tags() {
142
-        // Show the merge tags if the field is a list view
143
-        $is_list = preg_match( '/_list-/ism', $this->name );
144
-        // Or is a single entry view
145
-        $is_single = preg_match( '/single_/ism', $this->name );
146
-
147
-        return ( $is_single || $is_list );
148
-    }
149
-
150
-
151
-
152
-    /**
153
-     * important! Override this class
154
-     * outputs the field option html
155
-     */
156
-    function render_option() {
157
-        // to replace on each field
158
-    }
159
-
160
-    /**
161
-     * important! Override this class if needed
162
-     * outputs the field setting html
163
-     */
164
-    function render_setting( $override_input = NULL ) {
165
-
166
-        if( !empty( $this->field['full_width'] ) ) { ?>
119
+	/**
120
+	 * Retrieve field label class
121
+	 * @return string
122
+	 */
123
+	function get_label_class() {
124
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
125
+	}
126
+
127
+
128
+	/**
129
+	 * Retrieve field description
130
+	 * @return string
131
+	 */
132
+	function get_field_desc() {
133
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
134
+	}
135
+
136
+
137
+	/**
138
+	 * Verify if field should have merge tags
139
+	 * @return boolean
140
+	 */
141
+	function show_merge_tags() {
142
+		// Show the merge tags if the field is a list view
143
+		$is_list = preg_match( '/_list-/ism', $this->name );
144
+		// Or is a single entry view
145
+		$is_single = preg_match( '/single_/ism', $this->name );
146
+
147
+		return ( $is_single || $is_list );
148
+	}
149
+
150
+
151
+
152
+	/**
153
+	 * important! Override this class
154
+	 * outputs the field option html
155
+	 */
156
+	function render_option() {
157
+		// to replace on each field
158
+	}
159
+
160
+	/**
161
+	 * important! Override this class if needed
162
+	 * outputs the field setting html
163
+	 */
164
+	function render_setting( $override_input = NULL ) {
165
+
166
+		if( !empty( $this->field['full_width'] ) ) { ?>
167 167
             <th scope="row" colspan="2">
168 168
                 <div>
169 169
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -183,14 +183,14 @@  discard block
 block discarded – undo
183 183
             </td>
184 184
         <?php }
185 185
 
186
-    }
186
+	}
187 187
 
188
-    /**
189
-     * important! Override this class
190
-     * outputs the input html part
191
-     */
192
-    function render_input( $override_input ) {
193
-        echo '';
194
-    }
188
+	/**
189
+	 * important! Override this class
190
+	 * outputs the input html part
191
+	 */
192
+	function render_input( $override_input ) {
193
+		echo '';
194
+	}
195 195
 
196 196
 }
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   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		// Add the list columns
64 64
 		foreach ( $list_fields as $list_field ) {
65 65
 
66
-			if( empty( $list_field->enableColumns ) ) {
66
+			if ( empty( $list_field->enableColumns ) ) {
67 67
 				continue;
68 68
 			}
69 69
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			}
85 85
 
86 86
 			// If there are columns, add them under the parent field
87
-			if( ! empty( $list_columns ) ) {
87
+			if ( ! empty( $list_columns ) ) {
88 88
 
89 89
 				$index = array_search( $list_field->id, array_keys( $fields ) ) + 1;
90 90
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				 * Merge the $list_columns into the $fields array at $index
93 93
 				 * @see https://stackoverflow.com/a/1783125
94 94
 				 */
95
-				$fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true);
95
+				$fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true );
96 96
 			}
97 97
 
98 98
 			unset( $list_columns, $index, $input_id );
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 		$list_rows = maybe_unserialize( $field_value );
121 121
 
122
-		if( ! is_array( $list_rows ) ) {
122
+		if ( ! is_array( $list_rows ) ) {
123 123
 			gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) );
124 124
 			return null;
125 125
 		}
@@ -129,18 +129,18 @@  discard block
 block discarded – undo
129 129
 		// Each list row
130 130
 		foreach ( $list_rows as $list_row ) {
131 131
 			$current_column = 0;
132
-			foreach ( (array) $list_row as $column_key => $column_value ) {
132
+			foreach ( (array)$list_row as $column_key => $column_value ) {
133 133
 
134 134
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
135
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
136
-					$column_values[] = $column_value;
135
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
136
+					$column_values[ ] = $column_value;
137 137
 				}
138 138
 				$current_column++;
139 139
 			}
140 140
 		}
141 141
 
142 142
 		// Return the array of values
143
-		if( 'raw' === $format ) {
143
+		if ( 'raw' === $format ) {
144 144
 			return $column_values;
145 145
 		}
146 146
 		// Return the Gravity Forms Field output
@@ -163,22 +163,22 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public function _filter_field_label( $label, $field, $form, $entry ) {
165 165
 
166
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
166
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
167 167
 
168 168
 		// Not a list field
169
-		if( ! $field_object || 'list' !== $field_object->type ) {
169
+		if ( ! $field_object || 'list' !== $field_object->type ) {
170 170
 			return $label;
171 171
 		}
172 172
 
173 173
 		// Custom label is defined, so use it
174
-		if( ! empty( $field['custom_label'] ) ) {
174
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
175 175
 			return $label;
176 176
 		}
177 177
 
178
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
178
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
179 179
 
180 180
 		// Parent field, not column field
181
-		if( false === $column_id ) {
181
+		if ( false === $column_id ) {
182 182
 			return $label;
183 183
 		}
184 184
 
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
200 200
 
201 201
 		// Doesn't have columns enabled
202
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
202
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
203 203
 			return $backup_label;
204 204
 		}
205 205
 
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.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-woothemes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 		$gv_page = gravityview_is_admin_page( '', 'single' );
79 79
 
80 80
 		// New View or Edit View page
81
-		if( $gv_page && $pagenow === 'post-new.php' ) {
81
+		if ( $gv_page && $pagenow === 'post-new.php' ) {
82 82
 			remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' );
83 83
 		}
84 84
 	}
Please login to merge, or discard this patch.
includes/class-debug-bar.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 	function init() {
22 22
 
23 23
 		$icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i>&nbsp;' : NULL;
24
-		$this->title( $icon . __('GravityView', 'gravityview') );
24
+		$this->title( $icon . __( 'GravityView', 'gravityview' ) );
25 25
 	}
26 26
 
27 27
 	function get_warnings() {
28 28
 
29
-		if( is_null( $this->warnings ) ) {
29
+		if ( is_null( $this->warnings ) ) {
30 30
 			$this->warnings = GravityView_Logging::get_errors();
31 31
 		}
32 32
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
 	function get_notices() {
37 37
 
38
-		if( is_null( $this->notices ) ) {
38
+		if ( is_null( $this->notices ) ) {
39 39
 			$this->notices = GravityView_Logging::get_notices();
40 40
 		}
41 41
 
@@ -84,27 +84,27 @@  discard block
 block discarded – undo
84 84
 		</style>
85 85
 		<div id='debug-bar-gravityview'>";
86 86
 
87
-		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />';
87
+		$output .= '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="alignright" alt="" width="100" height="132" />';
88 88
 
89 89
 
90 90
 		$warnings = $this->get_warnings();
91 91
 		$notices = $this->get_notices();
92 92
 
93
-		if(count($warnings)) {
94
-			$output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>';
93
+		if ( count( $warnings ) ) {
94
+			$output .= '<h3><span>' . __( 'Warnings', 'gravityview' ) . '</span></h3>';
95 95
 			$output .= '<ol>';
96
-			foreach ( $warnings as $key => $notice) {
97
-				if(empty($notice['message'])) { continue; }
98
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
96
+			foreach ( $warnings as $key => $notice ) {
97
+				if ( empty( $notice[ 'message' ] ) ) { continue; }
98
+				$output .= '<li><a href="#' . sanitize_html_class( 'gv-warning-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>';
99 99
 			}
100 100
 			$output .= '</ol><hr />';
101 101
 		}
102
-		if(count($notices)) {
103
-			$output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>';
102
+		if ( count( $notices ) ) {
103
+			$output .= '<h3><span>' . __( 'Logs', 'gravityview' ) . '</span></h3>';
104 104
 			$output .= '<ol>';
105
-			foreach ( $notices as $key => $notice) {
106
-				if(empty($notice['message'])) { continue; }
107
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
105
+			foreach ( $notices as $key => $notice ) {
106
+				if ( empty( $notice[ 'message' ] ) ) { continue; }
107
+				$output .= '<li><a href="#' . sanitize_html_class( 'gv-notice-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>';
108 108
 			}
109 109
 			$output .= '</ol><hr />';
110 110
 		}
@@ -112,14 +112,14 @@  discard block
 block discarded – undo
112 112
 		if ( count( $warnings ) ) {
113 113
 			$output .= '<h3>Warnings</h3>';
114 114
 			$output .= '<ol class="debug-bar-php-list">';
115
-			foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-'  . $key ); }
115
+			foreach ( $warnings as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); }
116 116
 			$output .= '</ol>';
117 117
 		}
118 118
 
119 119
 		if ( count( $notices ) ) {
120 120
 			$output .= '<h3>Notices</h3>';
121 121
 			$output .= '<ol class="debug-bar-php-list">';
122
-			foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
122
+			foreach ( $notices as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
123 123
 			$output .= '</ol>';
124 124
 		}
125 125
 
@@ -133,17 +133,17 @@  discard block
 block discarded – undo
133 133
 	 * @param  string|array $item Unescaped
134 134
 	 * @return string       Escaped HTML
135 135
 	 */
136
-	function esc_html_recursive($item) {
137
-		if(is_object($item)) {
138
-			foreach($item as $key => $value) {
139
-				$item->{$key} = $this->esc_html_recursive($value);
136
+	function esc_html_recursive( $item ) {
137
+		if ( is_object( $item ) ) {
138
+			foreach ( $item as $key => $value ) {
139
+				$item->{$key} = $this->esc_html_recursive( $value );
140 140
 			}
141
-		} else if(is_array($item)) {
142
-			foreach($item as $key => $value) {
143
-				$item[$key] = $this->esc_html_recursive($value);
141
+		} else if ( is_array( $item ) ) {
142
+			foreach ( $item as $key => $value ) {
143
+				$item[ $key ] = $this->esc_html_recursive( $value );
144 144
 			}
145 145
 		} else {
146
-			$item = esc_html($item);
146
+			$item = esc_html( $item );
147 147
 		}
148 148
 		return $item;
149 149
 	}
@@ -159,26 +159,26 @@  discard block
 block discarded – undo
159 159
 
160 160
 		$output = '';
161 161
 
162
-		if(!empty($notice['message'])) {
163
-			$output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>';
162
+		if ( ! empty( $notice[ 'message' ] ) ) {
163
+			$output .= '<a id="' . sanitize_html_class( $anchor ) . '"></a>';
164 164
 			$output .= "<li class='debug-bar-php-notice'>";
165 165
 		}
166 166
 
167 167
 		$output .= '<div class="clear"></div>';
168 168
 
169 169
 		// Title
170
-		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>';
170
+		$output .= '<div class="gravityview-debug-bar-title">' . esc_attr( $notice[ 'message' ] ) . '</div>';
171 171
 
172 172
 		// Debugging Output
173
-		if( empty( $notice['data'] ) ) {
174
-			if( !is_null( $notice['data'] ) ) {
175
-				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
173
+		if ( empty( $notice[ 'data' ] ) ) {
174
+			if ( ! is_null( $notice[ 'data' ] ) ) {
175
+				$output .= '<em>' . _x( 'Empty', 'Debugging output data is empty.', 'gravityview' ) . '</em>';
176 176
 			}
177 177
 		} else {
178
-			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
178
+			$output .= sprintf( '<pre>%s</pre>', print_r( $this->esc_html_recursive( $notice[ 'data' ] ), true ) );
179 179
 		}
180 180
 
181
-		if(!empty($notice['message'])) {
181
+		if ( ! empty( $notice[ 'message' ] ) ) {
182 182
 			$output .= '</li>';
183 183
 		}
184 184
 
Please login to merge, or discard this patch.
includes/default-widgets.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,4 +5,4 @@
 block discarded – undo
5 5
  * @deprecated 1.7.5
6 6
  */
7 7
 
8
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
8
+include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-html.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
29 29
 
30
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
30
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
31 31
 
32 32
 		return $field_options;
33 33
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-number.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@
 block discarded – undo
28 28
 
29 29
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
30 30
 
31
-		$field_options['number_format'] = array(
31
+		$field_options[ 'number_format' ] = array(
32 32
 			'type' => 'checkbox',
33 33
 			'label' => __( 'Format number?', 'gravityview' ),
34
-			'desc' => __('Display numbers with thousands separators.', 'gravityview'),
34
+			'desc' => __( 'Display numbers with thousands separators.', 'gravityview' ),
35 35
 			'value' => false,
36 36
 		);
37 37
 
38
-		$field_options['decimals'] = array(
38
+		$field_options[ 'decimals' ] = array(
39 39
 			'type' => 'number',
40 40
 			'label' => __( 'Decimals', 'gravityview' ),
41
-			'desc' => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
41
+			'desc' => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ),
42 42
 			'value' => '',
43 43
 			'merge_tags' => false,
44 44
 		);
Please login to merge, or discard this patch.