Completed
Pull Request — develop (#1492)
by Zack
28:58 queued 09:00
created
includes/fields/class-gravityview-field-post-category.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
17 17
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		$entry = GFAPI::get_entry( $entry_id );
45 45
 		$post_id = \GV\Utils::get( $entry, 'post_id' );
46 46
 
47
-		if( empty( $post_id ) ) {
47
+		if ( empty( $post_id ) ) {
48 48
 			return false;
49 49
 		}
50 50
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
 		$post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' );
54 54
 
55
-		if( $post_category_fields ) {
55
+		if ( $post_category_fields ) {
56 56
 
57 57
 			$updated_categories = array();
58 58
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	 *
120 120
 	 * @return mixed
121 121
 	 */
122
-	function edit_entry_post_category_choices( $choices, $field, $form_id  ) {
122
+	function edit_entry_post_category_choices( $choices, $field, $form_id ) {
123 123
 
124
-		$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
124
+		$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
125 125
 
126 126
 		// $entry['post_id'] should always be set, but we check to make sure.
127
-		if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) {
127
+		if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) {
128 128
 
129 129
 			$post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) );
130 130
 
131 131
 			// Always use the live value
132 132
 			foreach ( $choices as &$choice ) {
133
-				$choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) );
133
+				$choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) );
134 134
 			}
135 135
 		}
136 136
 
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
 
140 140
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
141 141
 
142
-		if( 'edit' === $context ) {
142
+		if ( 'edit' === $context ) {
143 143
 			return $field_options;
144 144
 		}
145 145
 
146
-		$this->add_field_support('dynamic_data', $field_options );
147
-		$this->add_field_support('link_to_term', $field_options );
146
+		$this->add_field_support( 'dynamic_data', $field_options );
147
+		$this->add_field_support( 'link_to_term', $field_options );
148 148
 
149 149
 		return $field_options;
150 150
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-tags.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
 	var $is_searchable = true;
16 16
 
17
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
17
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
18 18
 
19 19
 	var $_gf_field_class_name = 'GF_Field_Post_Tags';
20 20
 
@@ -27,12 +27,12 @@  discard block
 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
-		if( 'edit' === $context ) {
30
+		if ( 'edit' === $context ) {
31 31
 			return $field_options;
32 32
 		}
33 33
 
34
-		$this->add_field_support('dynamic_data', $field_options );
35
-		$this->add_field_support('link_to_term', $field_options );
34
+		$this->add_field_support( 'dynamic_data', $field_options );
35
+		$this->add_field_support( 'link_to_term', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-excerpt.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['show_as_link'] );
27
+		unset( $field_options[ 'show_as_link' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$this->add_field_support('dynamic_data', $field_options );
33
+		$this->add_field_support( 'dynamic_data', $field_options );
34 34
 
35 35
 		return $field_options;
36 36
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-approval.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
26 26
 
27
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
27
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
28 28
 
29 29
 		$this->add_hooks();
30 30
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
48 48
 
49
-		unset( $field_options['only_loggedin'] );
49
+		unset( $field_options[ 'only_loggedin' ] );
50 50
 
51
-		unset( $field_options['new_window'] );
51
+		unset( $field_options[ 'new_window' ] );
52 52
 
53
-		unset( $field_options['show_as_link'] );
53
+		unset( $field_options[ 'show_as_link' ] );
54 54
 
55 55
 		return $field_options;
56 56
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
72 72
 
73
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
73
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
74 74
 
75 75
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
76 76
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	public function maybe_prevent_field_render( $html, $args ) {
93 93
 
94 94
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
95
-		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
95
+		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
96 96
 			return '';
97 97
 		}
98 98
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	public function modify_search_parameters( $parameters ) {
123 123
 
124 124
 		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
125
-			$parameters['sorting']['key'] = 'is_approved';
125
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
126 126
 		}
127 127
 
128 128
 		return $parameters;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	function register_scripts_and_styles() {
139 139
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
140 140
 
141
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
141
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
142 142
 
143 143
 		wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );
144 144
 		wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
 
147 147
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
148 148
 
149
-		if( class_exists( 'GravityView_View' ) ) {
149
+		if ( class_exists( 'GravityView_View' ) ) {
150 150
 			/**
151 151
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
152 152
 			 */
153 153
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
154 154
 		}
155 155
 
156
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
156
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
157 157
 
158 158
 		/**
159 159
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 		 */
163 163
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
164 164
 
165
-		if( ! empty( $style_url ) ) {
165
+		if ( ! empty( $style_url ) ) {
166 166
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
167 167
 		}
168 168
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 	public function enqueue_and_localize_script() {
178 178
 
179 179
 		// The script is already registered and enqueued
180
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
180
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
181 181
 			return;
182 182
 		}
183 183
 
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
190 190
 
191 191
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
192 192
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
193
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
193
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
194 194
 			'status' => GravityView_Entry_Approval_Status::get_all(),
195 195
 			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
196 196
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
197
-		));
197
+		) );
198 198
 
199 199
 	}
200 200
 
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
213 213
 
214
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
215
-			$entry_default_fields["{$this->name}"] = array(
214
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
215
+			$entry_default_fields[ "{$this->name}" ] = array(
216 216
 				'label' => $this->label,
217 217
 				'desc'  => $this->description,
218 218
 				'type'  => $this->name,
Please login to merge, or discard this patch.
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-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-source-url.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,24 +26,24 @@
 block discarded – undo
26 26
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
27 27
 
28 28
 		// Don't link to entry; doesn't make sense.
29
-		unset( $field_options['show_as_link'] );
29
+		unset( $field_options[ 'show_as_link' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35 35
 		$add_options = array();
36
-		$add_options['link_to_source'] = array(
36
+		$add_options[ 'link_to_source' ] = array(
37 37
 			'type' => 'checkbox',
38 38
 			'label' => __( 'Link to URL:', 'gravityview' ),
39
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
39
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
40 40
 			'value' => false,
41 41
 			'merge_tags' => false,
42 42
 		);
43
-		$add_options['source_link_text'] = array(
43
+		$add_options[ 'source_link_text' ] = array(
44 44
 			'type' => 'text',
45 45
 			'label' => __( 'Link Text:', 'gravityview' ),
46
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
46
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
47 47
 			'value' => NULL,
48 48
 			'merge_tags' => true,
49 49
 		);
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.