Completed
Push — develop ( 2f78cb...e17da6 )
by Zack
11:21
created
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.
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +49 added lines, -49 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,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( rgpost('screen_mode') !== 'edit' ) {
212
+        if ( rgpost( '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.
includes/class-gravityview-merge-tags.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	public static function process_modifiers( $value, $merge_tag, $modifier, $field, $raw_value ) {
46 46
 
47 47
 		// No modifier was set or the raw value was empty
48
-		if( 'all_fields' === $merge_tag || '' === $modifier || ! is_string( $raw_value ) || '' === $raw_value ) {
48
+		if ( 'all_fields' === $merge_tag || '' === $modifier || ! is_string( $raw_value ) || '' === $raw_value ) {
49 49
 			return $value;
50 50
 		}
51 51
 
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 		foreach ( $gv_modifiers as $gv_modifier => $method ) {
62 62
 
63 63
 			// Only match the regex if it's the first modifer; this allows us to enforce our own modifier structure
64
-			preg_match( '/^' . $gv_modifier .'/ism', $modifier, $matches );
64
+			preg_match( '/^' . $gv_modifier . '/ism', $modifier, $matches );
65 65
 
66
-			if( ! empty( $matches ) ) {
66
+			if ( ! empty( $matches ) ) {
67 67
 				// The called method is passed the raw value and the full matches array
68 68
 				$return = self::$method( $raw_value, $matches );
69 69
 				break;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	private static function modifier_timestamp( $raw_value, $matches ) {
89 89
 
90
-		if( empty( $matches[0] ) ) {
90
+		if ( empty( $matches[ 0 ] ) ) {
91 91
 			return $raw_value;
92 92
 		}
93 93
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	private static function modifier_wpautop( $raw_value, $matches ) {
113 113
 
114
-		if( empty( $matches[0] ) || ! function_exists( 'wpautop' ) ) {
114
+		if ( empty( $matches[ 0 ] ) || ! function_exists( 'wpautop' ) ) {
115 115
 			return $raw_value;
116 116
 		}
117 117
 
@@ -135,11 +135,11 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	private static function modifier_maxwords( $raw_value, $matches ) {
137 137
 
138
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
138
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
139 139
 			return $raw_value;
140 140
 		}
141 141
 
142
-		$max = intval( $matches[1] );
142
+		$max = intval( $matches[ 1 ] );
143 143
 
144 144
 		$more_placeholder = '[GVMORE]';
145 145
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @param  bool             $esc_html     Pass return value through `esc_html()`
172 172
 	 * @return string           Text with variables maybe replaced
173 173
 	 */
174
-	public static function replace_variables($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) {
174
+	public static function replace_variables( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) {
175 175
 
176 176
 		/**
177 177
 		 * @filter `gravityview_do_replace_variables` Turn off merge tag variable replacements.\n
@@ -196,9 +196,9 @@  discard block
 block discarded – undo
196 196
 		 * @internal Fixed $form['title'] in Gravity Forms
197 197
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
198 198
 		 */
199
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
200
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
201
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
199
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
200
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
201
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
202 202
 
203 203
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html );
204 204
 	}
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
222 222
 
223
-		if( '' === $text ) {
223
+		if ( '' === $text ) {
224 224
 			return $text;
225 225
 		}
226 226
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 		 * @see GFCommon::replace_variables_prepopulate()
231 231
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
232 232
 		 */
233
-		if( false === $form ) {
233
+		if ( false === $form ) {
234 234
 			return $text;
235 235
 		}
236 236
 
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
265 265
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
266 266
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
267
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
267
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
268 268
 		);
269 269
 
270 270
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -341,8 +341,8 @@  discard block
 block discarded – undo
341 341
 			return $original_text;
342 342
 		}
343 343
 
344
-		foreach ( (array) $matches as $match ) {
345
-			$full_tag = $match[0];
344
+		foreach ( (array)$matches as $match ) {
345
+			$full_tag = $match[ 0 ];
346 346
 			$modifier = rgar( $match, 2, 'permalink' );
347 347
 
348 348
 			$replacement = false;
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 					$replacement = esc_html( $replacement );
361 361
 				}
362 362
 
363
-				if( $url_encode ) {
363
+				if ( $url_encode ) {
364 364
 					$replacement = urlencode( $replacement );
365 365
 				}
366 366
 
@@ -400,14 +400,14 @@  discard block
 block discarded – undo
400 400
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
401 401
 
402 402
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
403
-		if( empty( $matches ) ) {
403
+		if ( empty( $matches ) ) {
404 404
 			return $text;
405 405
 		}
406 406
 
407 407
 		foreach ( $matches as $match ) {
408 408
 
409
-			$full_tag = $match[0];
410
-			$property = $match[1];
409
+			$full_tag = $match[ 0 ];
410
+			$property = $match[ 1 ];
411 411
 
412 412
 			$value = stripslashes_deep( rgget( $property ) );
413 413
 
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 			 * @since 1.15
432 432
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
433 433
 			 */
434
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
434
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
435 435
 
436 436
 			$value = $esc_html ? esc_html( $value ) : $value;
437 437
 
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 			 * @param[in] array $form Gravity Forms form array
443 443
 			 * @param[in] array $entry Entry array
444 444
 			 */
445
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
445
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
446 446
 
447 447
 			$text = str_replace( $full_tag, $value, $text );
448 448
 		}
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	     * @since 1.11
53 53
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
54 54
 	     */
55
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
55
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
56 56
 
57
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
57
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
58 58
 
59 59
 		    // last resort in case the current user display name don't match any of the defaults
60 60
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public function update_user( $form = array(), $entry_id = 0 ) {
74 74
 
75
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
75
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
76 76
 	        do_action( 'gravityview_log_error', __METHOD__ . ': GFAPI or User Registration class not found; not updating the user' );
77 77
 	        return;
78
-        } elseif( empty( $entry_id ) ) {
78
+        } elseif ( empty( $entry_id ) ) {
79 79
         	do_action( 'gravityview_log_error', __METHOD__ . ': Entry ID is empty; not updating the user', $entry_id );
80 80
 	        return;
81 81
         }
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	    }
102 102
 
103 103
 	    // If an Update feed, make sure the conditions are met.
104
-	    if( rgars( $config, 'meta/feedType' ) === 'update' ) {
105
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
104
+	    if ( rgars( $config, 'meta/feedType' ) === 'update' ) {
105
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
106 106
 			    return;
107 107
 		    }
108 108
 	    }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         remove_filter( 'send_email_change_email', '__return_false', 3 );
119 119
 
120 120
         // Prevent double-triggering by removing the hook
121
-	    remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
121
+	    remove_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10 );
122 122
     }
123 123
 
124 124
 	/**
@@ -151,17 +151,17 @@  discard block
 block discarded – undo
151 151
 	     */
152 152
 	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
153 153
 
154
-	    if( $preserve_role ) {
155
-		    $config['meta']['role'] = 'gfur_preserve_role';
154
+	    if ( $preserve_role ) {
155
+		    $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
156 156
 	    }
157 157
 
158
-	    $displayname = $this->match_current_display_name( $entry['created_by'] );
158
+	    $displayname = $this->match_current_display_name( $entry[ 'created_by' ] );
159 159
 
160 160
 	    /**
161 161
 	     * Make sure the current display name is not changed with the update user method.
162 162
 	     * @since 1.15
163 163
 	     */
164
-	    $config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
164
+	    $config[ 'meta' ][ 'displayname' ] = $displayname ? $displayname : $config[ 'meta' ][ 'displayname' ];
165 165
 
166 166
 	    /**
167 167
 	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
         $user = get_userdata( $user_id );
190 190
 
191
-        if( ! $user ) {
191
+        if ( ! $user ) {
192 192
         	return false;
193 193
         }
194 194
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
          * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
201 201
          * @see restore_display_name
202 202
          */
203
-        if( false === $format ) {
203
+        if ( false === $format ) {
204 204
             $this->_user_before_update = $user;
205 205
         }
206 206
 
@@ -218,20 +218,20 @@  discard block
 block discarded – undo
218 218
     public function generate_display_names( $profileuser ) {
219 219
 
220 220
         $public_display = array();
221
-        $public_display['nickname']  = $profileuser->nickname;
222
-        $public_display['username']  = $profileuser->user_login;
221
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
222
+        $public_display[ 'username' ]  = $profileuser->user_login;
223 223
 
224
-        if ( !empty($profileuser->first_name) ) {
225
-	        $public_display['firstname'] = $profileuser->first_name;
224
+        if ( ! empty( $profileuser->first_name ) ) {
225
+	        $public_display[ 'firstname' ] = $profileuser->first_name;
226 226
         }
227 227
 
228
-        if ( !empty($profileuser->last_name) ) {
229
-	        $public_display['lastname'] = $profileuser->last_name;
228
+        if ( ! empty( $profileuser->last_name ) ) {
229
+	        $public_display[ 'lastname' ] = $profileuser->last_name;
230 230
         }
231 231
 
232
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
233
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
234
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
232
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
233
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
234
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
235 235
         }
236 236
 
237 237
         $public_display = array_map( 'trim', $public_display );
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
          */
262 262
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
263 263
 
264
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
264
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
265 265
 
266 266
         /**
267 267
          * Don't restore display name:
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
          *   - or we don't need as we found the correct format before updating user.
271 271
          * @since 1.14.4
272 272
          */
273
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
273
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
274 274
             return null;
275 275
         }
276 276
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 
279 279
         // User not found
280 280
 	    if ( ! $user_after_update ) {
281
-	    	do_action('gravityview_log_error', __METHOD__ . sprintf( ' - User not found at $user_id #%d', $user_id ) );
281
+	    	do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - User not found at $user_id #%d', $user_id ) );
282 282
 		    return false;
283 283
 	    }
284 284
 
@@ -302,10 +302,10 @@  discard block
 block discarded – undo
302 302
 
303 303
         $updated = wp_update_user( $restored_user );
304 304
 
305
-        if( is_wp_error( $updated ) ) {
306
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
305
+        if ( is_wp_error( $updated ) ) {
306
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
307 307
         } else {
308
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
308
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
309 309
         }
310 310
 
311 311
         $this->_user_before_update = null;
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-recent-entries-widget.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 	function __construct( ) {
14 14
 
15
-		$name = __('GravityView Recent Entries', 'gravityview');
15
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
16 16
 
17 17
 		$widget_options = array(
18 18
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 	private function initialize() {
27 27
 
28
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
28
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
29 29
 
30 30
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
31 31
 
@@ -38,21 +38,21 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	function ajax_get_view_merge_tag_data() {
40 40
 
41
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
41
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
42 42
 			exit( false );
43 43
 		}
44 44
 
45
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
45
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
46 46
 
47 47
 		$form = RGFormsModel::get_form_meta( $form_id );
48 48
 
49 49
 		$output = array(
50 50
 			'form' => array(
51
-				'id' => $form['id'],
52
-				'title' => $form['title'],
53
-				'fields' => $form['fields'],
51
+				'id' => $form[ 'id' ],
52
+				'title' => $form[ 'title' ],
53
+				'fields' => $form[ 'fields' ],
54 54
 			),
55
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
55
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
56 56
 		);
57 57
 
58 58
 		echo json_encode( $output );
@@ -68,17 +68,17 @@  discard block
 block discarded – undo
68 68
 	function admin_enqueue_scripts() {
69 69
 		global $pagenow;
70 70
 
71
-		if( $pagenow === 'widgets.php' ) {
71
+		if ( $pagenow === 'widgets.php' ) {
72 72
 
73
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
73
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
74 74
 
75
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
75
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
76 76
 
77 77
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
78 78
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
79
-			));
79
+			) );
80 80
 
81
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
81
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
82 82
 		}
83 83
 
84 84
 	}
@@ -93,19 +93,19 @@  discard block
 block discarded – undo
93 93
 	function widget( $args, $instance ) {
94 94
 
95 95
 		// Don't have the Customizer render too soon.
96
-		if( empty( $instance['view_id'] ) ) {
96
+		if ( empty( $instance[ 'view_id' ] ) ) {
97 97
 			return;
98 98
 		}
99 99
 
100
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
101
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
100
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
101
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
102 102
 
103
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
103
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
104 104
 
105
-		echo $args['before_widget'];
105
+		echo $args[ 'before_widget' ];
106 106
 
107
-		if ( !empty( $title ) ) {
108
-			echo $args['before_title'] . $title . $args['after_title'];
107
+		if ( ! empty( $title ) ) {
108
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
109 109
 		}
110 110
 
111 111
 		/**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		 */
126 126
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
127 127
 
128
-		echo $args['after_widget'];
128
+		echo $args[ 'after_widget' ];
129 129
 	}
130 130
 
131 131
 	/**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	private function get_output( $instance ) {
141 141
 
142
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
142
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
143 143
 
144 144
 		$form = gravityview_get_form( $form_id );
145 145
 
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
 		 * @since 1.6.1
150 150
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
151 151
 		 */
152
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
152
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
153 153
 
154 154
 		/**
155 155
 		 * Generate list output
156 156
 		 * @since 1.7.2
157 157
 		 */
158
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
158
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget' );
159 159
 
160 160
 		$output = $List->get_output();
161 161
 
@@ -180,30 +180,30 @@  discard block
 block discarded – undo
180 180
 	private function get_entries( $instance, $form_id ) {
181 181
 
182 182
 		// Get the settings for the View ID
183
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
183
+		$view_settings = gravityview_get_template_settings( $instance[ 'view_id' ] );
184 184
 
185 185
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
186
-        $criteria['context_view_id'] = $instance['view_id'];
186
+        $criteria[ 'context_view_id' ] = $instance[ 'view_id' ];
187 187
 
188
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
189
-		$view_settings['id'] = $instance['view_id'];
190
-		$view_settings['page_size'] = $instance['limit'];
188
+		$instance[ 'limit' ] = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
189
+		$view_settings[ 'id' ] = $instance[ 'view_id' ];
190
+		$view_settings[ 'page_size' ] = $instance[ 'limit' ];
191 191
 
192 192
 		// Prepare paging criteria
193
-		$criteria['paging'] = array(
193
+		$criteria[ 'paging' ] = array(
194 194
 			'offset' => 0,
195
-			'page_size' => $instance['limit']
195
+			'page_size' => $instance[ 'limit' ]
196 196
 		);
197 197
 
198 198
 		// Prepare Search Criteria
199
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
200
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
201
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
199
+		$criteria[ 'search_criteria' ] = array( 'field_filters' => array() );
200
+		$criteria[ 'search_criteria' ] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria[ 'search_criteria' ] );
201
+		$criteria[ 'search_criteria' ][ 'status' ] = apply_filters( 'gravityview_status', 'active', $view_settings );
202 202
 
203 203
 		/**
204 204
 		 * Modify the search parameters before the entries are fetched
205 205
 		 */
206
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
206
+		$criteria = apply_filters( 'gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
207 207
 
208 208
 		$results = GVCommon::get_entries( $form_id, $criteria );
209 209
 
@@ -224,23 +224,23 @@  discard block
 block discarded – undo
224 224
 		$instance = $new_instance;
225 225
 
226 226
 		// Force positive number
227
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
227
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
228 228
 
229
-		$instance['view_id'] = intval( $instance['view_id'] );
229
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
230 230
 
231
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
231
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
232 232
 
233
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
233
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
234 234
 
235
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
235
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
236 236
 
237
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
237
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
238 238
 
239 239
 		//check if post_id is a valid post with embedded View
240
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
240
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
241 241
 
242 242
 		// Share that the widget isn't brand new
243
-		$instance['updated']  = 1;
243
+		$instance[ 'updated' ] = 1;
244 244
 
245 245
 		/**
246 246
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -262,22 +262,22 @@  discard block
 block discarded – undo
262 262
 
263 263
 		// Set up some default widget settings.
264 264
 		$defaults = array(
265
-			'title' 			=> __('Recent Entries', 'gravityview'),
265
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
266 266
 			'view_id'           => NULL,
267 267
 			'post_id'           => NULL,
268 268
 			'limit'            => 10,
269
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
269
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
270 270
 			'after_link'        => ''
271 271
 		);
272 272
 
273
-		$instance = wp_parse_args( (array) $instance, $defaults );
273
+		$instance = wp_parse_args( (array)$instance, $defaults );
274 274
 
275 275
 		?>
276 276
 
277 277
 		<!-- Title -->
278 278
 		<p>
279 279
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
280
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
280
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
281 281
 		</p>
282 282
 
283 283
 		<!-- Download -->
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		$views = get_posts( $args );
291 291
 
292 292
 		// If there are no views set up yet, we get outta here.
293
-		if( empty( $views ) ) {
293
+		if ( empty( $views ) ) {
294 294
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
295 295
 			return;
296 296
 		}
@@ -302,10 +302,10 @@  discard block
 block discarded – undo
302 302
 		 * Display errors generated for invalid embed IDs
303 303
 		 * @see GravityView_View_Data::is_valid_embed_id
304 304
 		 */
305
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
305
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
306 306
 			?>
307 307
 			<div class="error inline hide-on-view-change">
308
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
308
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
309 309
 			</div>
310 310
 			<?php
311 311
 			unset ( $error );
@@ -313,14 +313,14 @@  discard block
 block discarded – undo
313 313
 		?>
314 314
 
315 315
 		<p>
316
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
316
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
317 317
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
318 318
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
319 319
 				<?php
320 320
 
321
-				foreach( $views as $view ) {
322
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
323
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
321
+				foreach ( $views as $view ) {
322
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
323
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
324 324
 				}
325 325
 
326 326
 				?>
@@ -332,10 +332,10 @@  discard block
 block discarded – undo
332 332
 		 * Display errors generated for invalid embed IDs
333 333
 		 * @see GravityView_View_Data::is_valid_embed_id
334 334
 		 */
335
-		if( !empty( $instance['error_post_id'] ) ) {
335
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
336 336
 			?>
337 337
 			<div class="error inline">
338
-				<p><?php echo $instance['error_post_id']; ?></p>
338
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
339 339
 			</div>
340 340
 			<?php
341 341
 			unset ( $error );
@@ -343,11 +343,11 @@  discard block
 block discarded – undo
343 343
 		?>
344 344
 
345 345
 		<p>
346
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
347
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
346
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
347
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
348 348
 			<span class="howto"><?php
349
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
350
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
349
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
350
+				echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
351 351
 				?></span>
352 352
 		</p>
353 353
 
@@ -355,21 +355,21 @@  discard block
 block discarded – undo
355 355
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
356 356
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
357 357
 			</label>
358
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
358
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
359 359
 		</p>
360 360
 
361 361
 		<p>
362 362
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
363 363
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
364 364
 			</label>
365
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
365
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
366 366
 		</p>
367 367
 
368 368
 		<p>
369 369
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
370 370
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
371 371
 			</label>
372
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
372
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
373 373
 		</p>
374 374
 
375 375
 		<?php
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
380 380
 		 * @param array $instance Current widget instance
381 381
 		 */
382
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
382
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
383 383
 
384 384
 		?>
385 385
 
Please login to merge, or discard this patch.
includes/class-admin.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 	function __construct() {
6 6
 
7
-		if( ! is_admin() ) { return; }
7
+		if ( ! is_admin() ) { return; }
8 8
 
9 9
 		// If Gravity Forms isn't active or compatibile, stop loading
10
-		if( false === GravityView_Compatibility::is_valid() ) {
10
+		if ( false === GravityView_Compatibility::is_valid() ) {
11 11
 			return;
12 12
 		}
13 13
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
49 49
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
50 50
 
51
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
51
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
52 52
 
53 53
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
54 54
 
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	 */
64 64
 	public static function no_views_text() {
65 65
 		
66
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
66
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
67 67
 			return __( 'No Views found in Trash', 'gravityview' );
68
-		} elseif( ! empty( $_GET['s'] ) ) {
68
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
69 69
 			return __( 'No Views found.', 'gravityview' );
70 70
 		}
71 71
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			$error .= ' ' . esc_html__( 'or select another form.', 'gravityview' );
110 110
 		}
111 111
 
112
-		if( $error ) {
112
+		if ( $error ) {
113 113
 			?>
114 114
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
115 115
 				<?php echo gravityview_get_floaty(); ?>
@@ -128,22 +128,22 @@  discard block
 block discarded – undo
128 128
 	public function backend_actions() {
129 129
 
130 130
 		/** @define "GRAVITYVIEW_DIR" "../" */
131
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
132
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
133
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
134
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
135
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
136
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
137
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
138
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
139
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
131
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
132
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
133
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
134
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
135
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
136
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
137
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
139
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
140 140
 
141 141
 		/**
142 142
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
143 143
 		 *
144 144
 		 * Nice place to insert extensions' backend stuff
145 145
 		 */
146
-		do_action('gravityview_include_backend_actions');
146
+		do_action( 'gravityview_include_backend_actions' );
147 147
 	}
148 148
 
149 149
 	/**
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
 
160 160
 		$actions = array();
161 161
 
162
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
163
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
162
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
163
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
164 164
 		}
165 165
 
166
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
167
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
166
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
167
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
168 168
 		}
169 169
 
170 170
 		return array_merge( $actions, $links );
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 		// By default, there will only be one item being modified.
193 193
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
194 194
 		// of modified items that will override this array.
195
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
195
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
196 196
 
197 197
 		// If we're starting fresh, a new form was created.
198 198
 		// We should let the user know this is the case.
@@ -200,60 +200,60 @@  discard block
 block discarded – undo
200 200
 
201 201
 		$new_form_text = '';
202 202
 
203
-		if( !empty( $start_fresh ) ) {
203
+		if ( ! empty( $start_fresh ) ) {
204 204
 
205 205
 			// Get the form that was created
206 206
 			$connected_form = gravityview_get_form_id( $post_id );
207 207
 
208
-			if( !empty( $connected_form ) ) {
208
+			if ( ! empty( $connected_form ) ) {
209 209
 				$form = gravityview_get_form( $connected_form );
210
-				$form_name = esc_attr( $form['title'] );
210
+				$form_name = esc_attr( $form[ 'title' ] );
211 211
 				$image = self::get_floaty();
212
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
213
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
212
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
213
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
214 214
 
215 215
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
216
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
216
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
217 217
 				$new_form_text = wpautop( $new_form_text );
218 218
 
219 219
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
220 220
 			}
221 221
 		}
222 222
 
223
-		$messages['gravityview'] = array(
223
+		$messages[ 'gravityview' ] = array(
224 224
 			0  => '', // Unused. Messages start at index 1.
225 225
 			/* translators: %s and %s are HTML tags linking to the View on the website */
226
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
226
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
227 227
 			/* translators: %s and %s are HTML tags linking to the View on the website */
228
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
228
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
229 229
 			3  => __( 'View deleted.', 'gravityview' ),
230 230
 			/* translators: %s and %s are HTML tags linking to the View on the website */
231
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
231
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
232 232
 			/* translators: %s: date and time of the revision */
233
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
233
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
234 234
 			/* translators: %s and %s are HTML tags linking to the View on the website */
235
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
235
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
236 236
 			/* translators: %s and %s are HTML tags linking to the View on the website */
237
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
237
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
238 238
 			8  => __( 'View submitted.', 'gravityview' ),
239 239
 			9  => sprintf(
240 240
 		        /* translators: Date and time the View is scheduled to be published */
241 241
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
242 242
 				// translators: Publish box date format, see http://php.net/date
243
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
243
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
244 244
 			) . $new_form_text,
245 245
 			/* translators: %s and %s are HTML tags linking to the View on the website */
246
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
246
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
247 247
 
248 248
 			/**
249 249
 			 * These apply to `bulk_post_updated_messages`
250 250
 			 * @file wp-admin/edit.php
251 251
 			 */
252
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
253
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
254
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
255
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
256
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
252
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
253
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
254
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
255
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
256
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
257 257
 		);
258 258
 
259 259
 		return $messages;
@@ -313,29 +313,29 @@  discard block
 block discarded – undo
313 313
 	static function is_admin_page( $hook = '', $page = NULL ) {
314 314
 		global $current_screen, $plugin_page, $pagenow, $post;
315 315
 
316
-		if( ! is_admin() ) { return false; }
316
+		if ( ! is_admin() ) { return false; }
317 317
 
318 318
 		$is_page = false;
319 319
 
320
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
320
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
321 321
 
322
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
322
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
323 323
 
324
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
324
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
325 325
 
326
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
327
-			$gv_post = get_post( intval( $_GET['post'] ) );
328
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
326
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
327
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
328
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
329 329
 		} else {
330
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
330
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
331 331
 		}
332 332
 
333
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
333
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
334 334
 
335 335
 			// $_GET `post_type` variable
336
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
336
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
337 337
 				$is_page = 'single';
338
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
338
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
339 339
 				$is_page = 'settings';
340 340
 			} else {
341 341
 				$is_page = 'views';
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
351 351
 
352 352
 		// If the current page is the same as the compared page
353
-		if( !empty( $page ) ) {
353
+		if ( ! empty( $page ) ) {
354 354
 			return $is_page === $page;
355 355
 		}
356 356
 
@@ -371,6 +371,6 @@  discard block
 block discarded – undo
371 371
  *
372 372
  * @return bool|string If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
373 373
  */
374
-function gravityview_is_admin_page($hook = '', $page = NULL) {
374
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
375 375
 	return GravityView_Admin::is_admin_page( $hook, $page );
376 376
 }
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
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
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.
future/includes/class-gv-entry-gravityforms.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public static function by_id( $entry_id ) {
42 42
 		$entry = \GFAPI::get_entry( $entry_id );
43
-		if ( !$entry ) {
43
+		if ( ! $entry ) {
44 44
 			return null;
45 45
 		}
46 46
 
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
 	 * @return \GV\Entry|null An instance of this entry or null if not found.
56 56
 	 */
57 57
 	public static function from_entry( $entry ) {
58
-		if ( empty( $entry['id'] ) ) {
58
+		if ( empty( $entry[ 'id' ] ) ) {
59 59
 			return null;
60 60
 		}
61 61
 
62 62
 		$self = new self();
63 63
 		$self->entry = $entry;
64 64
 
65
-		$self->ID = $self->entry['id'];
65
+		$self->ID = $self->entry[ 'id' ];
66 66
 
67 67
 		return $self;
68 68
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return bool Whether the offset exists or not.
77 77
 	 */
78 78
 	public function offsetExists( $offset ) {
79
-		return isset( $this->entry[$offset] );
79
+		return isset( $this->entry[ $offset ] );
80 80
 	}
81 81
 
82 82
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return mixed The value of the requested entry data.
92 92
 	 */
93 93
 	public function offsetGet( $offset ) {
94
-		return $this->entry[$offset];
94
+		return $this->entry[ $offset ];
95 95
 	}
96 96
 
97 97
 	/**
Please login to merge, or discard this patch.
includes/class-gravityview-logging.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	function __construct() {
9 9
 
10
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
10
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
11 11
 
12
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
12
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
13 13
 
14 14
 		// Enable debug with Gravity Forms Logging Add-on
15 15
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
35 35
 		}
36 36
 
37
-		$panels[] = new GravityView_Debug_Bar;
37
+		$panels[ ] = new GravityView_Debug_Bar;
38 38
 
39 39
 		return $panels;
40 40
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param array $supported_plugins List of plugins
45 45
 	 */
46 46
 	public function enable_gform_logging( $supported_plugins ) {
47
-	    $supported_plugins['gravityview'] = 'GravityView';
47
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
48 48
 	    return $supported_plugins;
49 49
 	}
50 50
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @return string "print_r" or "var_export"
73 73
 	 */
74 74
 	static function get_print_function() {
75
-		if( ob_get_level() > 0 ) {
75
+		if ( ob_get_level() > 0 ) {
76 76
 			$function = 'var_export';
77 77
 		} else {
78 78
 			$function = 'print_r';
@@ -90,17 +90,17 @@  discard block
 block discarded – undo
90 90
 			'data' => $data,
91 91
 		);
92 92
 
93
-		if( !in_array( $notice, self::$notices ) ) {
94
-			self::$notices[] = $notice;
93
+		if ( ! in_array( $notice, self::$notices ) ) {
94
+			self::$notices[ ] = $notice;
95 95
 		}
96 96
 
97
-		if ( class_exists("GFLogging") ) {
97
+		if ( class_exists( "GFLogging" ) ) {
98 98
 			GFLogging::include_logger();
99
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
99
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
100 100
 	    }
101 101
 	}
102 102
 
103
-	static function log_error( $message = '', $data = null  ) {
103
+	static function log_error( $message = '', $data = null ) {
104 104
 
105 105
 		$function = self::get_print_function();
106 106
 
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
111 111
 		);
112 112
 
113
-		if( !in_array( $error, self::$errors ) ) {
114
-			self::$errors[] = $error;
113
+		if ( ! in_array( $error, self::$errors ) ) {
114
+			self::$errors[ ] = $error;
115 115
 		}
116 116
 
117
-		if ( class_exists("GFLogging") ) {
117
+		if ( class_exists( "GFLogging" ) ) {
118 118
 		    GFLogging::include_logger();
119
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ( $error, true), KLogger::ERROR );
119
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $error, true ), KLogger::ERROR );
120 120
 		}
121 121
 	}
122 122
 
Please login to merge, or discard this patch.