Completed
Push — develop ( 7592b8...3eb7c5 )
by Zack
14:44
created
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +48 added lines, -48 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,33 +56,33 @@  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
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
74
+    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - ' . $note );
75 75
 
76 76
 	    /**
77 77
 	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
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( rgget('screen_mode') === 'edit' ) {
153
-            $_POST["screen_mode"] = 'edit';
152
+        if ( rgget( 'screen_mode' ) === 'edit' ) {
153
+            $_POST[ "screen_mode" ] = 'edit';
154 154
         }
155 155
 
156 156
     }
@@ -161,42 +161,42 @@  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( rgpost('created_by') );
168
+        $created_by = absint( rgpost( 'created_by' ) );
169 169
 
170 170
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
171 171
 
172 172
         // If the creator has changed, let's add a note about who it used to be.
173
-        $originally_created_by = rgpost('originally_created_by');
173
+        $originally_created_by = rgpost( '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,24 +207,24 @@  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( rgpost('screen_mode') !== 'edit' ) {
212
+        if ( rgpost( 'screen_mode' ) !== 'edit' ) {
213 213
             return;
214 214
         }
215 215
 
216 216
         $users = GVCommon::get_users( 'change_entry_creator' );
217 217
 
218 218
         $output = '<label for="change_created_by">';
219
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
219
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
220 220
         $output .= '</label>
221 221
         <select name="created_by" id="change_created_by" class="widefat">';
222
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
223
-        foreach($users as $user) {
224
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
222
+        $output .= '<option value=""> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
223
+        foreach ( $users as $user ) {
224
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
225 225
         }
226 226
         $output .= '</select>';
227
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
227
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
228 228
         echo $output;
229 229
 
230 230
     }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-list.php 1 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
 			do_action( 'gravityview_log_error', __METHOD__ . ' - $field_value did not unserialize', $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.