Completed
Pull Request — develop (#1687)
by
unknown
16:12
created
includes/fields/class-gravityview-field-post-image.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -23,16 +23,16 @@  discard block
 block discarded – undo
23 23
 
24 24
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
25 25
 
26
-		unset ( $field_options['search_filter'] );
26
+		unset ( $field_options[ 'search_filter' ] );
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$this->add_field_support('link_to_post', $field_options );
32
+		$this->add_field_support( 'link_to_post', $field_options );
33 33
 
34 34
 		// @since 1.5.4
35
-		$this->add_field_support('dynamic_data', $field_options );
35
+		$this->add_field_support( 'dynamic_data', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 		$url = $title = $caption = $description = '';
60 60
 
61 61
 		// If there's a |:| match, process. Otherwise, empty array!
62
-		if( preg_match( '/\|\:\|/', $value ) ) {
62
+		if ( preg_match( '/\|\:\|/', $value ) ) {
63 63
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
64 64
 		}
65 65
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) {
90 90
 
91
-		$id = (int) $field->id;
92
-		$form_id = $form['id'];
91
+		$id = (int)$field->id;
92
+		$form_id = $form[ 'id' ];
93 93
 		$input_name = "input_{$id}";
94 94
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
95 95
 		$img_name = null;
@@ -97,16 +97,16 @@  discard block
 block discarded – undo
97 97
 		// Convert |:| to associative array
98 98
 		$img_array = self::explode_value( $value );
99 99
 
100
-		if( ! empty( $img_array['url'] ) ) {
100
+		if ( ! empty( $img_array[ 'url' ] ) ) {
101 101
 
102
-			$img_name = basename( $img_array['url'] );
102
+			$img_name = basename( $img_array[ 'url' ] );
103 103
 
104 104
 			/**
105 105
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
106 106
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
107 107
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
108 108
 			 */
109
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
109
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
110 110
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
111 111
 			}
112 112
 		}
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 		 * @hack
136 136
 		 */
137 137
 		if ( null !== $img_name ) {
138
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
139
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
138
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
139
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
140 140
 		}
141 141
 
142 142
 		return $gf_post_image_field_output;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gquiz_score.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			'quiz_use_max_score' => array(
31 31
 				'type' => 'checkbox',
32 32
 				'label' => __( 'Show Max Score?', 'gravityview' ),
33
-				'desc' => __('Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview'),
33
+				'desc' => __( 'Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview' ),
34 34
 				'value' => true,
35 35
 				'merge_tags' => false,
36 36
 			),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-approved.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	function add_default_field( $entry_default_fields, $form, $zone ) {
97 97
 
98
-		if( 'edit' !== $zone ) {
98
+		if ( 'edit' !== $zone ) {
99 99
 			$entry_default_fields[ $this->name ] = array(
100 100
 				'label' => $this->label,
101 101
 				'desc'  => $this->description,
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
 		$merge_tags = array(
122 122
 			array(
123
-				'label' => __('Approval Status', 'gravityview'),
123
+				'label' => __( 'Approval Status', 'gravityview' ),
124 124
 				'tag' => '{approval_status}'
125 125
 			),
126 126
 		);
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
160 160
 				gravityview()->log->error( 'No entry data available. Returning empty string.' );
161 161
 				$replacement = '';
162 162
 			} else {
163
-				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] );
163
+				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
164 164
 			}
165 165
 
166
-			$return = str_replace( $match[0], $replacement, $return );
166
+			$return = str_replace( $match[ 0 ], $replacement, $return );
167 167
 		}
168 168
 
169 169
 		return $return;
@@ -171,25 +171,25 @@  discard block
 block discarded – undo
171 171
 
172 172
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
173 173
 
174
-		$field_options['approved_label'] = array(
174
+		$field_options[ 'approved_label' ] = array(
175 175
 			'type' => 'text',
176 176
 			'label' => __( 'Approved Label', 'gravityview' ),
177 177
 			'desc' => __( 'If the entry is approved, display this value', 'gravityview' ),
178
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
178
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
179 179
 		);
180 180
 
181
-		$field_options['disapproved_label'] = array(
181
+		$field_options[ 'disapproved_label' ] = array(
182 182
 			'type' => 'text',
183 183
 			'label' => __( 'Disapproved Label', 'gravityview' ),
184 184
 			'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ),
185
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
185
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
186 186
 		);
187 187
 
188
-		$field_options['unapproved_label'] = array(
188
+		$field_options[ 'unapproved_label' ] = array(
189 189
 			'type' => 'text',
190 190
 			'label' => __( 'Unapproved Label', 'gravityview' ),
191 191
 			'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
192
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
192
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
193 193
 		);
194 194
 
195 195
 		return $field_options;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-title.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
 
29 29
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35
-		$this->add_field_support('link_to_post', $field_options );
35
+		$this->add_field_support( 'link_to_post', $field_options );
36 36
 
37
-		$this->add_field_support('dynamic_data', $field_options );
37
+		$this->add_field_support( 'dynamic_data', $field_options );
38 38
 
39 39
 		return $field_options;
40 40
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-date-created.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 
36 36
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
37 37
 
38
-		if( 'edit' === $context ) {
38
+		if ( 'edit' === $context ) {
39 39
 			return $field_options;
40 40
 		}
41 41
 
42
-		$this->add_field_support('date_display', $field_options );
42
+		$this->add_field_support( 'date_display', $field_options );
43 43
 
44 44
 		return $field_options;
45 45
 	}
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
62 62
 
63 63
 		/** Overridden by a template. */
64
-		if( ! empty( $field['field_path'] ) ) { return $output; }
64
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
65 65
 
66
-		return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
66
+		return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
67 67
 	}
68 68
 
69 69
 	/**
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 *
82 82
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
83 83
 	 */
84
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
84
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
85 85
 
86 86
 		$return = $text;
87 87
 
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 
91 91
 		foreach ( $matches as $match ) {
92 92
 
93
-			$full_tag          = $match[0];
94
-			$property          = $match[1];
93
+			$full_tag          = $match[ 0 ];
94
+			$property          = $match[ 1 ];
95 95
 
96 96
 			$formatted_date = GravityView_Merge_Tags::format_date( $date_created, $property );
97 97
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-section.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 
42 42
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
43 43
 
44
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
44
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
45 45
 
46 46
 		// Set the default CSS class to gv-section, which applies a border and top/bottom margin
47
-		$field_options['custom_class']['value'] = 'gv-section';
47
+		$field_options[ 'custom_class' ][ 'value' ] = 'gv-section';
48 48
 
49 49
 		return $field_options;
50 50
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-quiz.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
20 20
 
21
-		if( 'edit' === $context ) {
21
+		if ( 'edit' === $context ) {
22 22
 			return $field_options;
23 23
 		}
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			'quiz_show_explanation' => array(
27 27
 				'type' => 'checkbox',
28 28
 				'label' => __( 'Show Answer Explanation?', 'gravityview' ),
29
-				'desc' => __('If the field has an answer explanation, show it?', 'gravityview'),
29
+				'desc' => __( 'If the field has an answer explanation, show it?', 'gravityview' ),
30 30
 				'value' => false,
31 31
 				'merge_tags' => false,
32 32
 			),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-pipe_recorder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,13 +22,13 @@
 block discarded – undo
22 22
 
23 23
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
24 24
 
25
-		unset( $field_options['search_filter'] );
25
+		unset( $field_options[ 'search_filter' ] );
26 26
 
27 27
 		if ( 'edit' === $context ) {
28 28
 			return $field_options;
29 29
 		}
30 30
 
31
-		$add_options['embed'] = array(
31
+		$add_options[ 'embed' ] = array(
32 32
 			'type' => 'checkbox',
33 33
 			'label' => __( 'Display as embedded', 'gravityview' ),
34 34
 			'desc' => __( 'Display the video in a player, rather than a direct link to the video.', 'gravityview' ),
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
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
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.