Completed
Pull Request — develop (#1130)
by Zack
15:48
created
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 
61 61
 			if ( 'address' === \GV\Utils::get( $search_field, 'type' ) ) {
62 62
 
63
-				$field_id = intval( floor( $search_field['key'] ) );
64
-				$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
63
+				$field_id = intval( floor( $search_field[ 'key' ] ) );
64
+				$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
65 65
 				$form = GravityView_View::getInstance()->getForm();
66 66
 
67 67
 				/** @var GF_Field_Address $address_field */
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$choices = array();
71 71
 
72 72
 				$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
73
-				if( method_exists( $this, $method_name ) ) {
73
+				if ( method_exists( $this, $method_name ) ) {
74 74
 					/**
75 75
 					 * @uses GravityView_Field_Address::get_choices_country()
76 76
 					 * @uses GravityView_Field_Address::get_choices_state()
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 					$choices = $this->{$method_name}( $address_field );
79 79
 				}
80 80
 
81
-				if( ! empty( $choices ) ) {
82
-					$search_field['choices'] = $choices;
83
-					$search_field['type'] = \GV\Utils::get( $search_field, 'input');
81
+				if ( ! empty( $choices ) ) {
82
+					$search_field[ 'choices' ] = $choices;
83
+					$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
84 84
 				} else {
85
-					$search_field['type'] = 'text';
86
-					$search_field['input'] = 'input_text';
85
+					$search_field[ 'type' ] = 'text';
86
+					$search_field[ 'input' ] = 'input_text';
87 87
 				}
88 88
 			}
89 89
 		}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		$country_choices = array();
110 110
 
111 111
 		foreach ( $countries as $key => $country ) {
112
-			$country_choices[] = array(
112
+			$country_choices[ ] = array(
113 113
 				'value' => $country,
114 114
 				'text' => $country,
115 115
 			);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	private function get_choices_state( $address_field ) {
135 135
 
136
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
136
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
137 137
 
138 138
 		$state_choices = array();
139 139
 
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
145 145
 				$states = GFCommon::get_canadian_provinces();
146 146
 				break;
147 147
 			default:
148
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
148
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
149 149
 				break;
150 150
 		}
151 151
 
152 152
 		foreach ( $states as $key => $state ) {
153
-			$state_choices[] = array(
153
+			$state_choices[ ] = array(
154 154
 				'value' => $state,
155 155
 				'text' => $state,
156 156
 			);
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 		// Use the same inputs as the "text" input type allows
174 174
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
175 175
 
176
-		$input_types['street'] = $text_inputs;
177
-		$input_types['street2'] = $text_inputs;
178
-		$input_types['city'] = $text_inputs;
176
+		$input_types[ 'street' ] = $text_inputs;
177
+		$input_types[ 'street2' ] = $text_inputs;
178
+		$input_types[ 'city' ] = $text_inputs;
179 179
 
180
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
-		$input_types['zip'] = array( 'input_text' );
182
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
180
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
+		$input_types[ 'zip' ] = array( 'input_text' );
182
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
183 183
 
184 184
 		return $input_types;
185 185
 	}
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
201 201
 		$input_id = gravityview_get_input_id_from_id( $field_id );
202 202
 
203
-		if( 'address' === $field_type && $input_id ) {
203
+		if ( 'address' === $field_type && $input_id ) {
204 204
 
205 205
 			// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
206
-			if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
206
+			if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
207 207
 				$input_type = $address_field_name;
208 208
 			}
209 209
 		}
@@ -252,20 +252,20 @@  discard block
 block discarded – undo
252 252
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
253 253
 
254 254
 		// If this is NOT the full address field, return default options.
255
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
255
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
256 256
 			return $field_options;
257 257
 		}
258 258
 
259
-		if( 'edit' === $context ) {
259
+		if ( 'edit' === $context ) {
260 260
 			return $field_options;
261 261
 		}
262 262
 
263 263
 		$add_options = array();
264 264
 
265
-		$add_options['show_map_link'] = array(
265
+		$add_options[ 'show_map_link' ] = array(
266 266
 			'type' => 'checkbox',
267 267
 			'label' => __( 'Show Map Link:', 'gravityview' ),
268
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
268
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
269 269
 			'value' => true,
270 270
 			'merge_tags' => false,
271 271
 		);
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
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
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-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
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
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/class-gravityview-admin-bar.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 				'parent' => 'gravityview',
104 104
 				'title' => __( 'Edit Entry', 'gravityview' ),
105 105
 				'meta' => array(
106
-					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry['id'], $entry ) ),
106
+					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ) ),
107 107
 				),
108
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
108
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
109 109
 			) );
110 110
 
111 111
 		}
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 		/** @var WP_Admin_Bar $wp_admin_bar */
122 122
 		global $wp_admin_bar;
123 123
 
124
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
124
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
125 125
 
126 126
 			$view_data = GravityView_View_Data::getInstance();
127 127
 			$views = $view_data->get_views();
@@ -133,21 +133,21 @@  discard block
 block discarded – undo
133 133
 				$added_views = array();
134 134
 
135 135
 				foreach ( $views as $view ) {
136
-					$view = \GV\View::by_id( $view['id'] );
136
+					$view = \GV\View::by_id( $view[ 'id' ] );
137 137
 					$view_id = $view->ID;
138 138
 					$form_id = $view->form ? $view->form->ID : null;
139 139
 
140 140
 					$edit_view_title = __( 'Edit View', 'gravityview' );
141 141
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
142 142
 
143
-					if( sizeof( $views ) > 1 ) {
143
+					if ( sizeof( $views ) > 1 ) {
144 144
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
145 145
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
146 146
 					}
147 147
 
148
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
148
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
149 149
 
150
-						$added_views[] = $view_id;
150
+						$added_views[ ] = $view_id;
151 151
 
152 152
 						$wp_admin_bar->add_menu( array(
153 153
 							'id'    => 'edit-view-' . $view_id,
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 						) );
158 158
 					}
159 159
 
160
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
160
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
161 161
 
162
-						$added_forms[] = $form_id;
162
+						$added_forms[ ] = $form_id;
163 163
 
164 164
 						$wp_admin_bar->add_menu( array(
165 165
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 2 patches
Indentation   +205 added lines, -205 removed lines patch added patch discarded remove patch
@@ -5,251 +5,251 @@
 block discarded – undo
5 5
  */
6 6
 class GravityView_Change_Entry_Creator {
7 7
 
8
-    function __construct() {
9
-
10
-    	/**
11
-    	 * @since  1.5.1
12
-    	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
-
15
-    	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
17
-
18
-	    /**
19
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
-	     * @since 1.7.4
21
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
-	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
-		    return;
25
-	    }
26
-
27
-        /**
28
-         * Use `init` to fix bbPress warning
29
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
30
-         */
31
-    	add_action('init', array( $this, 'load'), 100 );
32
-
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
-
35
-    }
36
-
37
-    /**
38
-     * When an user is created using the User Registration add-on, assign the entry to them
39
-     *
40
-     * @since  1.5.1
41
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
-     * @param  int $user_id  WordPress User ID
43
-     * @param  array $config   User registration feed configuration
44
-     * @param  array  $entry     GF Entry array
45
-     * @param  string $password User password
46
-     * @return void
47
-     */
48
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
-
50
-    	/**
51
-    	 * Disable assigning the new user to the entry by returning false.
52
-    	 * @param  int $user_id  WordPress User ID
53
-	     * @param  array $config   User registration feed configuration
54
-	     * @param  array  $entry     GF Entry array
55
-    	 */
56
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
-
58
-    	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
60
-    		return;
61
-    	}
62
-
63
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
65
-
66
-    	if( empty( $result ) ) {
67
-    		$status = __('Error', 'gravityview');
68
-    	} else {
69
-    		$status = __('Success', 'gravityview');
70
-    	}
71
-
72
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
-
74
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note', $note ) );
75
-
76
-	    /**
77
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
78
-	     * @since 1.21.5
79
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80
-	     */
81
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
-		    return;
83
-	    }
84
-
85
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
8
+	function __construct() {
9
+
10
+		/**
11
+		 * @since  1.5.1
12
+		 */
13
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
+
15
+		// ONLY ADMIN FROM HERE ON.
16
+		if( !is_admin() ) { return; }
17
+
18
+		/**
19
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
+		 * @since 1.7.4
21
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
+		 */
23
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
+			return;
25
+		}
26
+
27
+		/**
28
+		 * Use `init` to fix bbPress warning
29
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
30
+		 */
31
+		add_action('init', array( $this, 'load'), 100 );
32
+
33
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
+
35
+	}
36
+
37
+	/**
38
+	 * When an user is created using the User Registration add-on, assign the entry to them
39
+	 *
40
+	 * @since  1.5.1
41
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
+	 * @param  int $user_id  WordPress User ID
43
+	 * @param  array $config   User registration feed configuration
44
+	 * @param  array  $entry     GF Entry array
45
+	 * @param  string $password User password
46
+	 * @return void
47
+	 */
48
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
+
50
+		/**
51
+		 * Disable assigning the new user to the entry by returning false.
52
+		 * @param  int $user_id  WordPress User ID
53
+		 * @param  array $config   User registration feed configuration
54
+		 * @param  array  $entry     GF Entry array
55
+		 */
56
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
+
58
+		// If filter returns false, do not process
59
+		if( empty( $assign_to_lead ) ) {
60
+			return;
61
+		}
62
+
63
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
+		$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
65
+
66
+		if( empty( $result ) ) {
67
+			$status = __('Error', 'gravityview');
68
+		} else {
69
+			$status = __('Success', 'gravityview');
70
+		}
71
+
72
+		$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
+
74
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note', $note ) );
75
+
76
+		/**
77
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
78
+		 * @since 1.21.5
79
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80
+		 */
81
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
+			return;
83
+		}
84
+
85
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
86 86
 
87
-    }
87
+	}
88 88
 
89
-    /**
90
-     * Disable previous functionality; use this one as the canonical.
91
-     * @return void
92
-     */
93
-    function prevent_conflicts() {
89
+	/**
90
+	 * Disable previous functionality; use this one as the canonical.
91
+	 * @return void
92
+	 */
93
+	function prevent_conflicts() {
94 94
 
95
-    	// Plugin that was provided here:
96
-    	// @link https://gravityview.co/support/documentation/201991205/
97
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99
-
100
-    	// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
95
+		// Plugin that was provided here:
96
+		// @link https://gravityview.co/support/documentation/201991205/
97
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99
+
100
+		// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
+		if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
102 102
 
103
-    		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
103
+			$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
104 104
 
105
-    		// Now, no validation is required in the methods; let's hook in.
106
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107
-
108
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109
-
110
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111
-    	}
112
-
113
-    }
114
-
115
-    /**
116
-     * @since  3.6.3
117
-     * @return void
118
-     */
119
-    function load() {
105
+			// Now, no validation is required in the methods; let's hook in.
106
+			remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107
+
108
+			remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109
+
110
+			remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111
+		}
112
+
113
+	}
114
+
115
+	/**
116
+	 * @since  3.6.3
117
+	 * @return void
118
+	 */
119
+	function load() {
120 120
 
121
-    	// Does GF exist?
122
-        if( !class_exists('GFCommon') ) {
123
-            return;
124
-        }
121
+		// Does GF exist?
122
+		if( !class_exists('GFCommon') ) {
123
+			return;
124
+		}
125 125
 
126
-        // Can the user edit entries?
127
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128
-            return;
129
-        }
126
+		// Can the user edit entries?
127
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128
+			return;
129
+		}
130 130
 
131
-        // If screen mode isn't set, then we're in the wrong place.
132
-        if( empty( $_REQUEST['screen_mode'] ) ) {
133
-            return;
134
-        }
131
+		// If screen mode isn't set, then we're in the wrong place.
132
+		if( empty( $_REQUEST['screen_mode'] ) ) {
133
+			return;
134
+		}
135 135
 
136
-        // Now, no validation is required in the methods; let's hook in.
137
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
136
+		// Now, no validation is required in the methods; let's hook in.
137
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
138 138
 
139
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
139
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
140 140
 
141
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
141
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
142 142
 
143
-    }
143
+	}
144 144
 
145
-    /**
146
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
147
-     * @return void
148
-     */
149
-    function set_screen_mode() {
145
+	/**
146
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
147
+	 * @return void
148
+	 */
149
+	function set_screen_mode() {
150 150
 
151
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
152
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
-            $_POST["screen_mode"] = 'edit';
154
-        }
151
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
152
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
+			$_POST["screen_mode"] = 'edit';
154
+		}
155 155
 
156
-    }
156
+	}
157 157
 
158
-    /**
159
-     * When the entry creator is changed, add a note to the entry
160
-     * @param  array $form   GF entry array
161
-     * @param  int $entry_id Entry ID
162
-     * @return void
163
-     */
164
-    function update_entry_creator($form, $entry_id) {
165
-            global $current_user;
158
+	/**
159
+	 * When the entry creator is changed, add a note to the entry
160
+	 * @param  array $form   GF entry array
161
+	 * @param  int $entry_id Entry ID
162
+	 * @return void
163
+	 */
164
+	function update_entry_creator($form, $entry_id) {
165
+			global $current_user;
166 166
 
167
-        // Update the entry
168
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
167
+		// Update the entry
168
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
169 169
 
170
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
170
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
171 171
 
172
-        // If the creator has changed, let's add a note about who it used to be.
173
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
172
+		// If the creator has changed, let's add a note about who it used to be.
173
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
174 174
 
175
-        // If there's no owner and there didn't used to be, keep going
176
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
177
-            return;
178
-        }
175
+		// If there's no owner and there didn't used to be, keep going
176
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
177
+			return;
178
+		}
179 179
 
180
-        // If the values have changed
181
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
180
+		// If the values have changed
181
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
182 182
 
183
-            $user_data = get_userdata($current_user->ID);
183
+			$user_data = get_userdata($current_user->ID);
184 184
 
185
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
185
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
186 186
 
187
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
187
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
188 188
 
189
-            if( !empty( $originally_created_by ) ) {
190
-                $originally_created_by_user_data = get_userdata($originally_created_by);
191
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192
-            }
189
+			if( !empty( $originally_created_by ) ) {
190
+				$originally_created_by_user_data = get_userdata($originally_created_by);
191
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192
+			}
193 193
 
194
-            if( !empty( $created_by ) ) {
195
-                $created_by_user_data =  get_userdata($created_by);
196
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197
-            }
194
+			if( !empty( $created_by ) ) {
195
+				$created_by_user_data =  get_userdata($created_by);
196
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197
+			}
198 198
 
199
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
200
-        }
199
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
200
+		}
201 201
 
202
-    }
202
+	}
203 203
 
204
-    /**
205
-     * Output the select to change the entry creator
206
-     * @param int $form_id GF Form ID
207
-     * @param array $entry    GF entry array
208
-     * @return void
209
-     */
210
-    function add_select($form_id, $entry ) {
204
+	/**
205
+	 * Output the select to change the entry creator
206
+	 * @param int $form_id GF Form ID
207
+	 * @param array $entry    GF entry array
208
+	 * @return void
209
+	 */
210
+	function add_select($form_id, $entry ) {
211 211
 
212
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213
-            return;
214
-        }
212
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213
+			return;
214
+		}
215 215
 
216
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
216
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
217 217
 
218
-        $users = GVCommon::get_users( 'change_entry_creator' );
218
+		$users = GVCommon::get_users( 'change_entry_creator' );
219 219
 
220
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
220
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
221 221
 
222
-        // Make sure that the entry creator is included in the users list. If not, add them.
223
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
222
+		// Make sure that the entry creator is included in the users list. If not, add them.
223
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
224 224
 
225
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
226
-	            $users = array_merge( $users, $created_by_user );
227
-	        }
228
-	    }
225
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
226
+				$users = array_merge( $users, $created_by_user );
227
+			}
228
+		}
229 229
 
230
-        $output = '<label for="change_created_by">';
231
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
232
-        $output .= '</label>';
230
+		$output = '<label for="change_created_by">';
231
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
232
+		$output .= '</label>';
233 233
 
234
-	    // If there are users who are not being shown, show a warning.
235
-	    // TODO: Use AJAX instead of <select>
236
-	    $count_users = count_users();
237
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
238
-		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
239
-	    }
234
+		// If there are users who are not being shown, show a warning.
235
+		// TODO: Use AJAX instead of <select>
236
+		$count_users = count_users();
237
+		if( sizeof( $users ) < $count_users['total_users'] ) {
238
+			$output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
239
+		}
240 240
 
241
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
-        foreach($users as $user) {
244
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
245
-        }
246
-        $output .= '</select>';
247
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
241
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
+		foreach($users as $user) {
244
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
245
+		}
246
+		$output .= '</select>';
247
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
248 248
 
249
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
249
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
250 250
 
251
-        echo $output;
252
-    }
251
+		echo $output;
252
+	}
253 253
 
254 254
 }
255 255
 
Please login to merge, or discard this patch.
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     	/**
11 11
     	 * @since  1.5.1
12 12
     	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
13
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
14 14
 
15 15
     	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
16
+    	if ( ! is_admin() ) { return; }
17 17
 
18 18
 	    /**
19 19
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20 20
 	     * @since 1.7.4
21 21
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22 22
 	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
23
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
24 24
 		    return;
25 25
 	    }
26 26
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
          * Use `init` to fix bbPress warning
29 29
          * @see https://bbpress.trac.wordpress.org/ticket/2309
30 30
          */
31
-    	add_action('init', array( $this, 'load'), 100 );
31
+    	add_action( 'init', array( $this, 'load' ), 100 );
32 32
 
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
33
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
34 34
 
35 35
     }
36 36
 
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57 57
 
58 58
     	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
59
+    	if ( empty( $assign_to_lead ) ) {
60 60
     		return;
61 61
     	}
62 62
 
63 63
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
64
+    	$result = RGFormsModel::update_lead_property( $entry[ 'id' ], 'created_by', $user_id, false, true );
65 65
 
66
-    	if( empty( $result ) ) {
67
-    		$status = __('Error', 'gravityview');
66
+    	if ( empty( $result ) ) {
67
+    		$status = __( 'Error', 'gravityview' );
68 68
     	} else {
69
-    		$status = __('Success', 'gravityview');
69
+    		$status = __( 'Success', 'gravityview' );
70 70
     	}
71 71
 
72
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
72
+    	$note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
73 73
 
74 74
     	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note', $note ) );
75 75
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 	     * @since 1.21.5
79 79
 	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80 80
 	     */
81
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
81
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) {
82 82
 		    return;
83 83
 	    }
84 84
 
85
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
85
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
86 86
 
87 87
     }
88 88
 
@@ -94,20 +94,20 @@  discard block
 block discarded – undo
94 94
 
95 95
     	// Plugin that was provided here:
96 96
     	// @link https://gravityview.co/support/documentation/201991205/
97
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
97
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99 99
 
100 100
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
101
+    	if ( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
102 102
 
103 103
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
104 104
 
105 105
     		// Now, no validation is required in the methods; let's hook in.
106
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
106
+    		remove_action( 'admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107 107
 
108
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
108
+    		remove_action( "gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109 109
 
110
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
110
+    		remove_action( "gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111 111
     	}
112 112
 
113 113
     }
@@ -119,26 +119,26 @@  discard block
 block discarded – undo
119 119
     function load() {
120 120
 
121 121
     	// Does GF exist?
122
-        if( !class_exists('GFCommon') ) {
122
+        if ( ! class_exists( 'GFCommon' ) ) {
123 123
             return;
124 124
         }
125 125
 
126 126
         // Can the user edit entries?
127
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
127
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128 128
             return;
129 129
         }
130 130
 
131 131
         // If screen mode isn't set, then we're in the wrong place.
132
-        if( empty( $_REQUEST['screen_mode'] ) ) {
132
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
133 133
             return;
134 134
         }
135 135
 
136 136
         // Now, no validation is required in the methods; let's hook in.
137
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
137
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
138 138
 
139
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
139
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
140 140
 
141
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
141
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
142 142
 
143 143
     }
144 144
 
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
     function set_screen_mode() {
150 150
 
151 151
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
152
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
-            $_POST["screen_mode"] = 'edit';
152
+        if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
+            $_POST[ "screen_mode" ] = 'edit';
154 154
         }
155 155
 
156 156
     }
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
      * @param  int $entry_id Entry ID
162 162
      * @return void
163 163
      */
164
-    function update_entry_creator($form, $entry_id) {
164
+    function update_entry_creator( $form, $entry_id ) {
165 165
             global $current_user;
166 166
 
167 167
         // Update the entry
168
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
168
+        $created_by = absint( \GV\Utils::_POST( 'created_by' ) );
169 169
 
170 170
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
171 171
 
@@ -173,30 +173,30 @@  discard block
 block discarded – undo
173 173
         $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
174 174
 
175 175
         // If there's no owner and there didn't used to be, keep going
176
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
176
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
177 177
             return;
178 178
         }
179 179
 
180 180
         // If the values have changed
181
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
181
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
182 182
 
183
-            $user_data = get_userdata($current_user->ID);
183
+            $user_data = get_userdata( $current_user->ID );
184 184
 
185
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
185
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
186 186
 
187
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
187
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
188 188
 
189
-            if( !empty( $originally_created_by ) ) {
190
-                $originally_created_by_user_data = get_userdata($originally_created_by);
189
+            if ( ! empty( $originally_created_by ) ) {
190
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
191 191
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192 192
             }
193 193
 
194
-            if( !empty( $created_by ) ) {
195
-                $created_by_user_data =  get_userdata($created_by);
194
+            if ( ! empty( $created_by ) ) {
195
+                $created_by_user_data = get_userdata( $created_by );
196 196
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197 197
             }
198 198
 
199
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
199
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
200 200
         }
201 201
 
202 202
     }
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
      * @param array $entry    GF entry array
208 208
      * @return void
209 209
      */
210
-    function add_select($form_id, $entry ) {
210
+    function add_select( $form_id, $entry ) {
211 211
 
212
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
212
+        if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213 213
             return;
214 214
         }
215 215
 
@@ -228,23 +228,23 @@  discard block
 block discarded – undo
228 228
 	    }
229 229
 
230 230
         $output = '<label for="change_created_by">';
231
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
231
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
232 232
         $output .= '</label>';
233 233
 
234 234
 	    // If there are users who are not being shown, show a warning.
235 235
 	    // TODO: Use AJAX instead of <select>
236 236
 	    $count_users = count_users();
237
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
237
+	    if ( sizeof( $users ) < $count_users[ 'total_users' ] ) {
238 238
 		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
239 239
 	    }
240 240
 
241 241
 	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
-        foreach($users as $user) {
244
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
242
+        $output .= '<option value="' . selected( $entry[ 'created_by' ], '0', false ) . '"> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
243
+        foreach ( $users as $user ) {
244
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
245 245
         }
246 246
         $output .= '</select>';
247
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
247
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
248 248
 
249 249
 	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
250 250
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-legacy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 		global $post;
35 35
 
36 36
 		if ( $post ) {
37
-			$context['post'] = $post;
37
+			$context[ 'post' ] = $post;
38 38
 		}
39 39
 
40 40
 		\GV\Mocks\Legacy_Context::push( $context );
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry-list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,9 +64,9 @@
 block discarded – undo
64 64
 		 */
65 65
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
66 66
 
67
-		$extras['hide_empty'] = $hide_empty;
68
-		$extras['label'] = $label;
69
-		$extras['value'] = $value;
67
+		$extras[ 'hide_empty' ] = $hide_empty;
68
+		$extras[ 'label' ] = $label;
69
+		$extras[ 'value' ] = $value;
70 70
 
71 71
 		return \gravityview_field_output( $extras, $context );
72 72
 	}
Please login to merge, or discard this patch.
future/lib/class-gamajo-template-loader.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		 *
86 86
 		 * @var array
87 87
 		 */
88
-		private $template_data_var_names = array('data');
88
+		private $template_data_var_names = array( 'data' );
89 89
 
90 90
 		/**
91 91
 		 * Clean up template data.
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 		public function set_template_data( $data, $var_name = 'data' ) {
139 139
 			global $wp_query;
140 140
 
141
-			$wp_query->query_vars[ $var_name ] = (object) $data;
141
+			$wp_query->query_vars[ $var_name ] = (object)$data;
142 142
 
143 143
 			// Add $var_name to custom variable store if not default value
144
-			if( $var_name !== 'data' ) {
145
-				$this->template_data_var_names[] = $var_name;
144
+			if ( $var_name !== 'data' ) {
145
+				$this->template_data_var_names[ ] = $var_name;
146 146
 			}
147 147
 
148 148
 			return $this;
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 
166 166
 			// Remove each custom data reference from $wp_query
167 167
 			foreach ( $custom_var_names as $var ) {
168
-				if ( isset( $wp_query->query_vars[$var] ) ) {
169
-					unset( $wp_query->query_vars[$var] );
168
+				if ( isset( $wp_query->query_vars[ $var ] ) ) {
169
+					unset( $wp_query->query_vars[ $var ] );
170 170
 				}
171 171
 			}
172 172
 
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 		protected function get_template_file_names( $slug, $name ) {
187 187
 			$templates = array();
188 188
 			if ( isset( $name ) ) {
189
-				$templates[] = $slug . '-' . $name . '.php';
189
+				$templates[ ] = $slug . '-' . $name . '.php';
190 190
 			}
191
-			$templates[] = $slug . '.php';
191
+			$templates[ ] = $slug . '.php';
192 192
 
193 193
 			/**
194 194
 			 * Allow template choices to be filtered.
@@ -224,18 +224,18 @@  discard block
 block discarded – undo
224 224
 		public function locate_template( $template_names, $load = false, $require_once = true ) {
225 225
 
226 226
 			// Use $template_names as a cache key - either first element of array or the variable itself if it's a string
227
-			$cache_key = is_array( $template_names ) ? $template_names[0] : $template_names;
227
+			$cache_key = is_array( $template_names ) ? $template_names[ 0 ] : $template_names;
228 228
 
229 229
 			// If the key is in the cache array, we've already located this file.
230
-			if ( isset( $this->template_path_cache[$cache_key] ) ) {
231
-				$located = $this->template_path_cache[$cache_key];
230
+			if ( isset( $this->template_path_cache[ $cache_key ] ) ) {
231
+				$located = $this->template_path_cache[ $cache_key ];
232 232
 			} else {
233 233
 
234 234
 				// No file found yet.
235 235
 				$located = false;
236 236
 
237 237
 				// Remove empty entries.
238
-				$template_names = array_filter( (array) $template_names );
238
+				$template_names = array_filter( (array)$template_names );
239 239
 				$template_paths = $this->get_template_paths();
240 240
 
241 241
 				// Try to find a template file.
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 						if ( file_exists( $template_path . $template_name ) ) {
249 249
 							$located = $template_path . $template_name;
250 250
 							// Store the template path in the cache
251
-							$this->template_path_cache[$cache_key] = $located;
251
+							$this->template_path_cache[ $cache_key ] = $located;
252 252
 							break 2;
253 253
 						}
254 254
 					}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
285 285
 			if ( get_stylesheet_directory() !== get_template_directory() ) {
286
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
286
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
287 287
 			}
288 288
 
289 289
 			/**
Please login to merge, or discard this patch.
future/includes/class-gv-renderer-view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,8 +115,8 @@
 block discarded – undo
115 115
 			'entries' => $entries,
116 116
 			'request' => $request,
117 117
 		), empty( $parameters ) ? array() : array(
118
-			'paging' => $parameters['paging'],
119
-			'sorting' => $parameters['sorting'],
118
+			'paging' => $parameters[ 'paging' ],
119
+			'sorting' => $parameters[ 'sorting' ],
120 120
 		), empty( $post ) ? array() : array(
121 121
 			'post' => $post,
122 122
 		) ) );
Please login to merge, or discard this patch.