Completed
Pull Request — master (#1171)
by Zack
95:41 queued 34:43
created
future/includes/class-gv-template-view-list.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
 		do_action( 'gravityview/template/list/body/before', $context );
152 152
 
153 153
 		/**
154
-		* @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
-		* @deprecated Use `gravityview/template/list/body/before`
156
-		* @since 1.0.7
157
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
158
-		*/
154
+		 * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
+		 * @deprecated Use `gravityview/template/list/body/before`
156
+		 * @since 1.0.7
157
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
158
+		 */
159 159
 		do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
160 160
 	}
161 161
 
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 		do_action( 'gravityview/template/list/body/after', $context );
178 178
 
179 179
 		/**
180
-		* @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
-		* @deprecated Use `gravityview/template/list/body/after`
182
-		* @since 1.0.7
183
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
184
-		*/
180
+		 * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
+		 * @deprecated Use `gravityview/template/list/body/after`
182
+		 * @since 1.0.7
183
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
184
+		 */
185 185
 		do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
186 186
 	}
187 187
 
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
212 212
 		$zone = str_replace( '/', '_', $zone );
213 213
 
214 214
 		/**
215
-		* @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
-		* @deprecated Use `gravityview/template/list/entry/$zone/before`
217
-		* @since 1.0.7
218
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
219
-		*/
215
+		 * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
+		 * @deprecated Use `gravityview/template/list/entry/$zone/before`
217
+		 * @since 1.0.7
218
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
219
+		 */
220 220
 		do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
221 221
 	}
222 222
 
@@ -247,11 +247,11 @@  discard block
 block discarded – undo
247 247
 		$zone = str_replace( '/', '_', $zone );
248 248
 
249 249
 		/**
250
-		* @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
-		* @deprecated Use `gravityview/template/list/entry/after`
252
-		* @since 1.0.7
253
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
254
-		*/
250
+		 * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
+		 * @deprecated Use `gravityview/template/list/entry/after`
252
+		 * @since 1.0.7
253
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
254
+		 */
255 255
 		do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
256 256
 	}
257 257
 }
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Indentation   +166 added lines, -166 removed lines patch added patch discarded remove patch
@@ -18,80 +18,80 @@  discard block
 block discarded – undo
18 18
 
19 19
 class GravityView_Edit_Entry {
20 20
 
21
-    /**
22
-     * @var string
23
-     */
21
+	/**
22
+	 * @var string
23
+	 */
24 24
 	static $file;
25 25
 
26 26
 	static $instance;
27 27
 
28
-    /**
29
-     * Component instances.
30
-     * @var array
31
-     */
32
-    public $instances = array();
28
+	/**
29
+	 * Component instances.
30
+	 * @var array
31
+	 */
32
+	public $instances = array();
33 33
 
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+		self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
41
-        }
39
+		if( is_admin() ) {
40
+			$this->load_components( 'admin' );
41
+		}
42 42
 
43 43
 
44
-        $this->load_components( 'render' );
44
+		$this->load_components( 'render' );
45 45
 
46
-        // If GF User Registration Add-on exists
47
-        $this->load_components( 'user-registration' );
46
+		// If GF User Registration Add-on exists
47
+		$this->load_components( 'user-registration' );
48 48
 
49
-        $this->add_hooks();
49
+		$this->add_hooks();
50 50
 
51 51
 		// Process hooks for addons that may or may not be present
52 52
 		$this->addon_specific_hooks();
53 53
 	}
54 54
 
55 55
 
56
-    static function getInstance() {
56
+	static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
59
-            self::$instance = new GravityView_Edit_Entry;
60
-        }
58
+		if( empty( self::$instance ) ) {
59
+			self::$instance = new GravityView_Edit_Entry;
60
+		}
61 61
 
62
-        return self::$instance;
63
-    }
62
+		return self::$instance;
63
+	}
64 64
 
65 65
 
66
-    private function load_components( $component ) {
66
+	private function load_components( $component ) {
67 67
 
68
-        $dir = trailingslashit( self::$file );
68
+		$dir = trailingslashit( self::$file );
69 69
 
70
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
70
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
72 72
 
73
-        // Loads component and pass extension's instance so that component can
74
-        // talk each other.
75
-        require_once $filename;
76
-        $this->instances[ $component ] = new $classname( $this );
77
-        $this->instances[ $component ]->load();
73
+		// Loads component and pass extension's instance so that component can
74
+		// talk each other.
75
+		require_once $filename;
76
+		$this->instances[ $component ] = new $classname( $this );
77
+		$this->instances[ $component ]->load();
78 78
 
79
-    }
79
+	}
80 80
 
81
-    private function add_hooks() {
81
+	private function add_hooks() {
82 82
 
83
-        // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
83
+		// Add front-end access to Gravity Forms delete file action
84
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
85 85
 
86
-        // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
86
+		// Make sure this hook is run for non-admins
87
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
88 88
 
89
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
89
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
91
-        // add template path to check for field
92
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
91
+		// add template path to check for field
92
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
93 93
 
94
-    }
94
+	}
95 95
 
96 96
 	/**
97 97
 	 * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin
@@ -105,77 +105,77 @@  discard block
 block discarded – undo
105 105
 
106 106
 	}
107 107
 
108
-    /**
109
-     * Include this extension templates path
110
-     * @param array $file_paths List of template paths ordered
111
-     */
112
-    public function add_template_path( $file_paths ) {
113
-
114
-        // Index 100 is the default GravityView template path.
115
-        $file_paths[ 110 ] = self::$file;
116
-
117
-        return $file_paths;
118
-    }
119
-
120
-    /**
121
-     *
122
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
123
-     *
124
-     * @param $view_id int GravityView view id
125
-     * @param $form_id int Gravity Forms form id
126
-     * @param $entry_id int Gravity Forms entry id
127
-     * @return string
128
-     */
129
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
130
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
-    }
132
-
133
-
134
-    /**
135
-     * The edit entry link creates a secure link with a nonce
136
-     *
137
-     * It also mimics the URL structure Gravity Forms expects to have so that
138
-     * it formats the display of the edit form like it does in the backend, like
139
-     * "You can edit this post from the post page" fields, for example.
140
-     *
141
-     * @param $entry array Gravity Forms entry object
142
-     * @param $view_id int GravityView view id
143
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
144
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
145
-     * @return string
146
-     */
147
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148
-
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
150
-
151
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
152
-
153
-        $url = add_query_arg( array(
154
-            'edit' => wp_create_nonce( $nonce_key )
155
-        ), $base );
156
-
157
-        if( $post_id ) {
158
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
159
-        }
160
-
161
-	    /**
162
-	     * Allow passing params to dynamically populate entry with values
163
-	     * @since 1.9.2
164
-	     */
165
-	    if( !empty( $field_values ) ) {
166
-
167
-		    if( is_array( $field_values ) ) {
168
-			    // If already an array, no parse_str() needed
169
-			    $params = $field_values;
170
-		    } else {
171
-			    parse_str( $field_values, $params );
172
-		    }
173
-
174
-		    $url = add_query_arg( $params, $url );
175
-	    }
176
-
177
-        return $url;
178
-    }
108
+	/**
109
+	 * Include this extension templates path
110
+	 * @param array $file_paths List of template paths ordered
111
+	 */
112
+	public function add_template_path( $file_paths ) {
113
+
114
+		// Index 100 is the default GravityView template path.
115
+		$file_paths[ 110 ] = self::$file;
116
+
117
+		return $file_paths;
118
+	}
119
+
120
+	/**
121
+	 *
122
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
123
+	 *
124
+	 * @param $view_id int GravityView view id
125
+	 * @param $form_id int Gravity Forms form id
126
+	 * @param $entry_id int Gravity Forms entry id
127
+	 * @return string
128
+	 */
129
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
130
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
+	}
132
+
133
+
134
+	/**
135
+	 * The edit entry link creates a secure link with a nonce
136
+	 *
137
+	 * It also mimics the URL structure Gravity Forms expects to have so that
138
+	 * it formats the display of the edit form like it does in the backend, like
139
+	 * "You can edit this post from the post page" fields, for example.
140
+	 *
141
+	 * @param $entry array Gravity Forms entry object
142
+	 * @param $view_id int GravityView view id
143
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
144
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
145
+	 * @return string
146
+	 */
147
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148
+
149
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
150
+
151
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
152
+
153
+		$url = add_query_arg( array(
154
+			'edit' => wp_create_nonce( $nonce_key )
155
+		), $base );
156
+
157
+		if( $post_id ) {
158
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
159
+		}
160
+
161
+		/**
162
+		 * Allow passing params to dynamically populate entry with values
163
+		 * @since 1.9.2
164
+		 */
165
+		if( !empty( $field_values ) ) {
166
+
167
+			if( is_array( $field_values ) ) {
168
+				// If already an array, no parse_str() needed
169
+				$params = $field_values;
170
+			} else {
171
+				parse_str( $field_values, $params );
172
+			}
173
+
174
+			$url = add_query_arg( $params, $url );
175
+		}
176
+
177
+		return $url;
178
+	}
179 179
 
180 180
 	/**
181 181
 	 * Edit mode doesn't allow certain field types.
@@ -229,82 +229,82 @@  discard block
 block discarded – undo
229 229
 	}
230 230
 
231 231
 
232
-    /**
233
-     * checks if user has permissions to edit a specific entry
234
-     *
235
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
236
-     *
237
-     * @param  array $entry Gravity Forms entry array
238
-     * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
239
-     * @return bool
240
-     */
241
-    public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
232
+	/**
233
+	 * checks if user has permissions to edit a specific entry
234
+	 *
235
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
236
+	 *
237
+	 * @param  array $entry Gravity Forms entry array
238
+	 * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
239
+	 * @return bool
240
+	 */
241
+	public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
242 242
 
243
-        // No permission by default
244
-        $user_can_edit = false;
243
+		// No permission by default
244
+		$user_can_edit = false;
245 245
 
246
-        // If they can edit any entries (as defined in Gravity Forms)
247
-        // Or if they can edit other people's entries
248
-        // Then we're good.
249
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
246
+		// If they can edit any entries (as defined in Gravity Forms)
247
+		// Or if they can edit other people's entries
248
+		// Then we're good.
249
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
250 250
 
251
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
251
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
252 252
 
253
-            $user_can_edit = true;
253
+			$user_can_edit = true;
254 254
 
255
-        } else if( !isset( $entry['created_by'] ) ) {
255
+		} else if( !isset( $entry['created_by'] ) ) {
256 256
 
257
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
257
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
258 258
 
259
-            $user_can_edit = false;
259
+			$user_can_edit = false;
260 260
 
261
-        } else {
261
+		} else {
262 262
 
263
-            // get user_edit setting
264
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
265
-                // if View ID not specified or is the current view
263
+			// get user_edit setting
264
+			if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
265
+				// if View ID not specified or is the current view
266 266
 				// @deprecated path
267
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
268
-            } else {
269
-                // in case is specified and not the current view
270
-                $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
271
-            }
267
+				$user_edit = GravityView_View::getInstance()->getAtts('user_edit');
268
+			} else {
269
+				// in case is specified and not the current view
270
+				$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
271
+			}
272 272
 
273
-            $current_user = wp_get_current_user();
273
+			$current_user = wp_get_current_user();
274 274
 
275
-            // User edit is disabled
276
-            if( empty( $user_edit ) ) {
275
+			// User edit is disabled
276
+			if( empty( $user_edit ) ) {
277 277
 
278
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
278
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
279 279
 
280
-                $user_can_edit = false;
281
-            }
280
+				$user_can_edit = false;
281
+			}
282 282
 
283
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
284
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
283
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
284
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
285 285
 
286
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
286
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
287 287
 
288
-                $user_can_edit = true;
288
+				$user_can_edit = true;
289 289
 
290
-            } else if( ! is_user_logged_in() ) {
290
+			} else if( ! is_user_logged_in() ) {
291 291
 
292
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
293
-            }
292
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
293
+			}
294 294
 
295
-        }
295
+		}
296 296
 
297
-        /**
298
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
299
-         * @since 1.15 Added `$entry` and `$view_id` parameters
300
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
301
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
302
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
303
-         */
304
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
297
+		/**
298
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
299
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
300
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
301
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
302
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
303
+		 */
304
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
305 305
 
306
-        return (bool)$user_can_edit;
307
-    }
306
+		return (bool)$user_can_edit;
307
+	}
308 308
 
309 309
 
310 310
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/view-configuration.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+				do_action('gravityview_render_field_pickers', 'directory' );
32 32
 
33
-            ?>
33
+			?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
-                }
61
-			    ?>
58
+				if(!empty( $curr_template ) ) {
59
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
+				}
61
+				?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+				do_action('gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+				do_action('gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@  discard block
 block discarded – undo
7 7
 <div id="publishing-action">
8 8
 	<?php
9 9
 
10
-    /**
11
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
-     * @since 1.11.1
13
-     * @param string $back_link Existing URL of the Cancel link
14
-     * @param array $form The Gravity Forms form
15
-     * @param array $entry The Gravity Forms entry
16
-     * @param int $view_id The current View ID
17
-     */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
10
+	/**
11
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
+	 * @since 1.11.1
13
+	 * @param string $back_link Existing URL of the Cancel link
14
+	 * @param array $form The Gravity Forms form
15
+	 * @param array $entry The Gravity Forms entry
16
+	 * @param int $view_id The current View ID
17
+	 */
18
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	/**
54 54
 	 * @action `gravityview/edit-entry/publishing-action/after` Triggered after the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
55 55
 	 * @since 1.5.1
56
-     * @since 2.0.13 Added $post_id
56
+	 * @since 2.0.13 Added $post_id
57 57
 	 * @param array $form The Gravity Forms form
58 58
 	 * @param array $entry The Gravity Forms entry
59 59
 	 * @param int $view_id The current View ID
60
-     * @param int $post_id The current Post ID
60
+	 * @param int $post_id The current Post ID
61 61
 	 */
62 62
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
63 63
 
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -346,14 +346,14 @@  discard block
 block discarded – undo
346 346
 	/**
347 347
 	 * update_approved function.
348 348
 	 *
349
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
349
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
350 350
 	 * @see GravityView_Entry_Approval::update_approved
351
-     *
351
+	 *
352 352
 	 * @param int $entry_id (default: 0)
353 353
 	 * @param int $approved (default: 0)
354 354
 	 * @param int $form_id (default: 0)
355 355
 	 * @param int $approvedcolumn (default: 0)
356
-     *
356
+	 *
357 357
 	 * @return boolean True: It worked; False: it failed
358 358
 	 */
359 359
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -363,9 +363,9 @@  discard block
 block discarded – undo
363 363
 	/**
364 364
 	 * Calculate the approve field.input id
365 365
 	 *
366
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
367
-     * @see GravityView_Entry_Approval::get_approved_column
368
-     *
366
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
367
+	 * @see GravityView_Entry_Approval::get_approved_column
368
+	 *
369 369
 	 * @param mixed $form GF Form or Form ID
370 370
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
371 371
 	 */
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
487 487
 			'bulk_message' => $this->bulk_update_message,
488 488
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
489
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
489
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
490 490
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
491 491
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
492 492
 			'column_link' => esc_url( $this->get_sort_link() ),
@@ -495,26 +495,26 @@  discard block
 block discarded – undo
495 495
 	}
496 496
 
497 497
 	/**
498
-     * Generate a link to sort by approval status
499
-     *
500
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
501
-     * numeric, but it does group the approved entries together.
502
-     *
503
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
504
-     *
498
+	 * Generate a link to sort by approval status
499
+	 *
500
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
501
+	 * numeric, but it does group the approved entries together.
502
+	 *
503
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
504
+	 *
505 505
 	 * @param int $form_id [NO LONGER USED]
506 506
 	 *
507 507
 	 * @return string Sorting link
508 508
 	 */
509 509
 	private function get_sort_link( $form_id = 0 ) {
510 510
 
511
-	    $args = array(
512
-		    'orderby' => 'is_approved',
513
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
514
-        );
511
+		$args = array(
512
+			'orderby' => 'is_approved',
513
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
514
+		);
515 515
 
516 516
 		return add_query_arg( $args );
517
-    }
517
+	}
518 518
 
519 519
 	/**
520 520
 	 * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group
@@ -556,9 +556,9 @@  discard block
 block discarded – undo
556 556
 		// Sanitize the values, just to be sure.
557 557
 		foreach ( $bulk_actions as $key => $group ) {
558 558
 
559
-		    if( empty( $group ) ) {
560
-		        continue;
561
-		    }
559
+			if( empty( $group ) ) {
560
+				continue;
561
+			}
562 562
 
563 563
 			foreach ( $group as $i => $action ) {
564 564
 				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
Please login to merge, or discard this patch.
includes/class-admin.php 1 patch
Indentation   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return void
93 93
 	 */
94 94
 	public static function connected_form_warning( $form_id = 0 ) {
95
-        global $pagenow;
95
+		global $pagenow;
96 96
 
97 97
 		if ( empty( $form_id ) || $pagenow === 'post-new.php' ) {
98 98
 			return;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
239 239
 			8  => __( 'View submitted.', 'gravityview' ),
240 240
 			9  => sprintf(
241
-		        /* translators: Date and time the View is scheduled to be published */
241
+				/* translators: Date and time the View is scheduled to be published */
242 242
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
243 243
 				// translators: Publish box date format, see http://php.net/date
244 244
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -295,7 +295,6 @@  discard block
 block discarded – undo
295 295
 	 *
296 296
 	 * @deprecated since 1.12
297 297
 	 * @see GravityView_Compatibility::get_plugin_status()
298
-
299 298
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
300 299
 	 */
301 300
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
future/includes/class-gv-extension.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -305,13 +305,13 @@
 block discarded – undo
305 305
 			$this->_remote_update_url,
306 306
 			$this->_path,
307 307
 			array(
308
-            	'version'	=> $this->_version, // current version number
309
-            	'license'	=> \GV\Utils::get( $license, 'license_key', $license['license'] ),
310
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
-            	'item_name' => $this->_title,  // name of this plugin
312
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
313
-          	)
314
-        );
308
+				'version'	=> $this->_version, // current version number
309
+				'license'	=> \GV\Utils::get( $license, 'license_key', $license['license'] ),
310
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
+				'item_name' => $this->_title,  // name of this plugin
312
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
313
+		  	)
314
+		);
315 315
 	}
316 316
 
317 317
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -134,28 +134,28 @@  discard block
 block discarded – undo
134 134
 	 */
135 135
 	public function add_network_menu() {
136 136
 
137
-	    if ( ! gravityview()->plugin->is_network_activated() ) {
137
+		if ( ! gravityview()->plugin->is_network_activated() ) {
138 138
 			return;
139 139
 		}
140 140
 
141
-        add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
141
+		add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
142 142
 	}
143 143
 
144 144
 	/**
145
-     * Uninstall all traces of GravityView
146
-     *
147
-     * Note: method is public because parent method is public
148
-     *
145
+	 * Uninstall all traces of GravityView
146
+	 *
147
+	 * Note: method is public because parent method is public
148
+	 *
149 149
 	 * @return bool
150 150
 	 */
151 151
 	public function uninstall() {
152 152
 		gravityview()->plugin->uninstall();
153 153
 
154 154
 		/**
155
-         * Set the path so that Gravity Forms can de-activate GravityView
156
-         * @see GFAddOn::uninstall_addon
157
-         * @uses deactivate_plugins()
158
-         */
155
+		 * Set the path so that Gravity Forms can de-activate GravityView
156
+		 * @see GFAddOn::uninstall_addon
157
+		 * @uses deactivate_plugins()
158
+		 */
159 159
 		$this->_path = GRAVITYVIEW_FILE;
160 160
 
161 161
 		return true;
@@ -185,42 +185,42 @@  discard block
 block discarded – undo
185 185
 	}
186 186
 
187 187
 	/**
188
-     * Get an array of reasons why the plugin might be uninstalled
189
-     *
190
-     * @since 1.17.5
191
-     *
188
+	 * Get an array of reasons why the plugin might be uninstalled
189
+	 *
190
+	 * @since 1.17.5
191
+	 *
192 192
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
193 193
 	 */
194 194
 	private function get_uninstall_reasons() {
195 195
 		$reasons = array(
196 196
 			'will-continue' => array(
197
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
198
-            ),
197
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
198
+			),
199 199
 			'no-longer-need' => array(
200
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
201
-            ),
200
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
201
+			),
202 202
 			'doesnt-work' => array(
203
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
204
-            ),
203
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
204
+			),
205 205
 			'found-other' => array(
206
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
207
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
208
-            ),
206
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
207
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
208
+			),
209 209
 			'other' => array(
210
-                'label' => esc_html__( 'Other', 'gravityview' ),
211
-            ),
210
+				'label' => esc_html__( 'Other', 'gravityview' ),
211
+			),
212 212
 		);
213 213
 
214 214
 		shuffle( $reasons );
215 215
 
216 216
 		return $reasons;
217
-    }
217
+	}
218 218
 
219 219
 	/**
220
-     * Display a feedback form when the plugin is uninstalled
221
-     *
222
-     * @since 1.17.5
223
-     *
220
+	 * Display a feedback form when the plugin is uninstalled
221
+	 *
222
+	 * @since 1.17.5
223
+	 *
224 224
 	 * @return string HTML of the uninstallation form
225 225
 	 */
226 226
 	public function uninstall_form() {
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
301 301
             <ul>
302 302
 				<?php
303
-                $reasons = $this->get_uninstall_reasons();
303
+				$reasons = $this->get_uninstall_reasons();
304 304
 				foreach ( $reasons as $reason ) {
305 305
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
306 306
 				}
@@ -394,12 +394,12 @@  discard block
 block discarded – undo
394 394
 	}
395 395
 
396 396
 	public function app_settings_tab() {
397
-	    parent::app_settings_tab();
397
+		parent::app_settings_tab();
398 398
 
399 399
 		if ( $this->maybe_uninstall() ) {
400
-            echo $this->uninstall_form();
400
+			echo $this->uninstall_form();
401 401
 		}
402
-    }
402
+	}
403 403
 
404 404
 	/**
405 405
 	 * The Settings title
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 	 * @return array The settings.
485 485
 	 */
486 486
 	public function all() {
487
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
487
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
488 488
 	}
489 489
 
490 490
 	/**
@@ -553,8 +553,8 @@  discard block
 block discarded – undo
553 553
                     type="' . $field['type'] . '"
554 554
                     name="' . esc_attr( $name ) . '"
555 555
                     value="' . $value . '" ' .
556
-		        implode( ' ', $attributes ) .
557
-		        ' />';
556
+				implode( ' ', $attributes ) .
557
+				' />';
558 558
 
559 559
 		if ( $echo ) {
560 560
 			echo $html;
@@ -572,12 +572,12 @@  discard block
 block discarded – undo
572 572
 	}
573 573
 
574 574
 	/**
575
-     * Check whether GravityView is being saved
576
-     *
577
-     * The generic is_save_postback() is true for all addons
578
-     *
579
-     * @since 2.0.8
580
-     *
575
+	 * Check whether GravityView is being saved
576
+	 *
577
+	 * The generic is_save_postback() is true for all addons
578
+	 *
579
+	 * @since 2.0.8
580
+	 *
581 581
 	 * @return bool
582 582
 	 */
583 583
 	public function is_save_postback() {
@@ -591,16 +591,16 @@  discard block
 block discarded – undo
591 591
 	 */
592 592
 	public function license_key_notice() {
593 593
 
594
-	    if( $this->is_save_postback() ) {
595
-		    $settings = $this->get_posted_settings();
596
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
597
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
598
-        } else {
599
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
600
-		    $license_key    = $this->get( 'license_key' );
601
-	    }
594
+		if( $this->is_save_postback() ) {
595
+			$settings = $this->get_posted_settings();
596
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
597
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
598
+		} else {
599
+			$license_status = $this->get( 'license_key_status', 'inactive' );
600
+			$license_key    = $this->get( 'license_key' );
601
+		}
602 602
 
603
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
603
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
604 604
 
605 605
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
606 606
 
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
 		$update_below = false;
618 618
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
619 619
 
620
-        switch ( $license_status ) {
620
+		switch ( $license_status ) {
621 621
 			/** @since 1.17 */
622 622
 			case 'expired':
623 623
 				$title = __( 'Expired License', 'gravityview' );
@@ -655,13 +655,13 @@  discard block
 block discarded – undo
655 655
 			return;
656 656
 		}
657 657
 
658
-        \GravityView_Admin_Notices::add_notice( array(
659
-            'message' => $message,
660
-            'class'   => 'notice notice-warning',
661
-            'title'   => $title,
662
-            'cap'     => 'gravityview_edit_settings',
663
-            'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default)
664
-        ) );
658
+		\GravityView_Admin_Notices::add_notice( array(
659
+			'message' => $message,
660
+			'class'   => 'notice notice-warning',
661
+			'title'   => $title,
662
+			'cap'     => 'gravityview_edit_settings',
663
+			'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default)
664
+		) );
665 665
 	}
666 666
 
667 667
 	/**
@@ -675,12 +675,12 @@  discard block
 block discarded – undo
675 675
 	}
676 676
 
677 677
 	/**
678
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
679
-     *
680
-     * @since 1.21.5
681
-     *
682
-     * @see GFAddOn::scripts()
683
-     *
678
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
679
+	 *
680
+	 * @since 1.21.5
681
+	 *
682
+	 * @see GFAddOn::scripts()
683
+	 *
684 684
 	 * @return array Array of scripts
685 685
 	 */
686 686
 	public function scripts() {
@@ -689,10 +689,10 @@  discard block
 block discarded – undo
689 689
 		$scripts[] = array(
690 690
 			'handle'  => 'gform_tooltip_init',
691 691
 			'enqueue' => array(
692
-                array(
693
-			        'admin_page' => array( 'app_settings' )
694
-                )
695
-            )
692
+				array(
693
+					'admin_page' => array( 'app_settings' )
694
+				)
695
+			)
696 696
 		);
697 697
 
698 698
 		return $scripts;
@@ -710,10 +710,10 @@  discard block
 block discarded – undo
710 710
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
711 711
 			'version' => Plugin::$version,
712 712
 			'deps' => array(
713
-                'gform_admin',
713
+				'gform_admin',
714 714
 				'gaddon_form_settings_css',
715
-                'gform_tooltip',
716
-                'gform_font_awesome',
715
+				'gform_tooltip',
716
+				'gform_font_awesome',
717 717
 			),
718 718
 			'enqueue' => array(
719 719
 				array( 'admin_page' => array(
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 					array(
882 882
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
883 883
 						'value' => '1',
884
-                        'name'  => 'beta',
884
+						'name'  => 'beta',
885 885
 					),
886 886
 				),
887 887
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
@@ -919,38 +919,38 @@  discard block
 block discarded – undo
919 919
 
920 920
 			if ( empty( $field['disabled'] ) ) {
921 921
 				unset( $field['disabled'] );
922
-            }
922
+			}
923 923
 		}
924 924
 
925
-        $sections = array(
926
-            array(
927
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
928
-                'fields'      => $fields,
929
-            )
930
-        );
925
+		$sections = array(
926
+			array(
927
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
928
+				'fields'      => $fields,
929
+			)
930
+		);
931 931
 
932
-        // custom 'update settings' button
933
-        $button = array(
934
-            'class' => 'button button-primary button-hero',
935
-            'type' => 'save',
936
-        );
932
+		// custom 'update settings' button
933
+		$button = array(
934
+			'class' => 'button button-primary button-hero',
935
+			'type' => 'save',
936
+		);
937 937
 
938 938
 		if ( $disabled_attribute ) {
939 939
 			$button['disabled'] = $disabled_attribute;
940 940
 		}
941 941
 
942
-        /**
943
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
944
-         * Extensions can tap in here to insert their own section and settings.
945
-         * <code>
946
-         *   $sections[] = array(
947
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
948
-         *      'fields' => $settings,
949
-         *   );
950
-         * </code>
951
-         * @param array $extension_settings Empty array, ready for extension settings!
952
-         */
953
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
942
+		/**
943
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
944
+		 * Extensions can tap in here to insert their own section and settings.
945
+		 * <code>
946
+		 *   $sections[] = array(
947
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
948
+		 *      'fields' => $settings,
949
+		 *   );
950
+		 * </code>
951
+		 * @param array $extension_settings Empty array, ready for extension settings!
952
+		 */
953
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
954 954
 
955 955
 		// If there are extensions, add a section for them
956 956
 		if ( ! empty( $extension_sections ) ) {
@@ -963,13 +963,13 @@  discard block
 block discarded – undo
963 963
 				}
964 964
 			}
965 965
 
966
-            $k = count( $extension_sections ) - 1 ;
967
-            $extension_sections[ $k ]['fields'][] = $button;
966
+			$k = count( $extension_sections ) - 1 ;
967
+			$extension_sections[ $k ]['fields'][] = $button;
968 968
 			$sections = array_merge( $sections, $extension_sections );
969 969
 		} else {
970
-            // add the 'update settings' button to the general section
971
-            $sections[0]['fields'][] = $button;
972
-        }
970
+			// add the 'update settings' button to the general section
971
+			$sections[0]['fields'][] = $button;
972
+		}
973 973
 
974 974
 		return $sections;
975 975
 	}
@@ -1023,9 +1023,9 @@  discard block
 block discarded – undo
1023 1023
 	 */
1024 1024
 	protected function settings_edd_license( $field, $echo = true ) {
1025 1025
 
1026
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1027
-		    $field['input_type'] = 'password';
1028
-        }
1026
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1027
+			$field['input_type'] = 'password';
1028
+		}
1029 1029
 
1030 1030
 		$text = $this->settings_text( $field, false );
1031 1031
 
@@ -1042,9 +1042,9 @@  discard block
 block discarded – undo
1042 1042
 
1043 1043
 	/**
1044 1044
 	 * Allow pure HTML settings row
1045
-     *
1046
-     * @since 2.0.6
1047
-     *
1045
+	 *
1046
+	 * @since 2.0.6
1047
+	 *
1048 1048
 	 * @param array $field
1049 1049
 	 * @param bool $echo Whether to echo the
1050 1050
 	 *
@@ -1110,19 +1110,19 @@  discard block
 block discarded – undo
1110 1110
 	}
1111 1111
 
1112 1112
 	/**
1113
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1114
-     *
1115
-     * Converts `$field['description']` to `$field['gv_description']`
1116
-     * Converts `$field['subtitle']` to `$field['description']`
1117
-     *
1118
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1119
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1120
-     *
1121
-     * @since 1.21.5.2
1122
-     *
1113
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1114
+	 *
1115
+	 * Converts `$field['description']` to `$field['gv_description']`
1116
+	 * Converts `$field['subtitle']` to `$field['description']`
1117
+	 *
1118
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1119
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1120
+	 *
1121
+	 * @since 1.21.5.2
1122
+	 *
1123 1123
 	 * @param array $field
1124
-     *
1125
-     * @return void
1124
+	 *
1125
+	 * @return void
1126 1126
 	 */
1127 1127
 	public function single_setting_row( $field ) {
1128 1128
 		$field['gv_description'] = Utils::get( $field, 'description' );
Please login to merge, or discard this patch.
includes/class-admin-installer.php 1 patch
Indentation   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public function add_downloads_data_filters() {
68 68
 
69
-	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
69
+		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
70 70
 
71
-	    if ( ! $downloads_data ) {
71
+		if ( ! $downloads_data ) {
72 72
 			return;
73 73
 		}
74 74
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_admin_menu() {
99 99
 
100
-	    $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
100
+		$menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
101 101
 
102 102
 		$menu_text = sprintf( '<span title="%s">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text );
103 103
 
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	}
113 113
 
114 114
 	/**
115
-     * When on the Installer page, show a different notice than on the Settings page
116
-     *
115
+	 * When on the Installer page, show a different notice than on the Settings page
116
+	 *
117 117
 	 * @param array $notice
118 118
 	 *
119 119
 	 * @return string License notice
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
121 121
 	public function maybe_modify_license_notice( $notice = '' ) {
122 122
 
123 123
 		if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) {
124
-            return $notice;
125
-        }
124
+			return $notice;
125
+		}
126 126
 
127
-        return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
127
+		return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
128 128
 	}
129 129
 
130 130
 	/**
@@ -162,43 +162,43 @@  discard block
 block discarded – undo
162 162
 	 * Get downloads data from transient or from API; save transient after getting data from API
163 163
 	 *
164 164
 	 * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: {
165
-     *   @type array  $info {
166
-     *       @type string $id int 17
167
-     *       @type string $slug Extension slug
168
-     *       @type string $title Extension title
169
-     *       @type string $create_date in '2018-07-19 20:03:10' format
170
-     *       @type string $modified_date
171
-     *       @type string $status
172
-     *       @type string $link URL to public plugin page
173
-     *       @type string $content
174
-     *       @type string $excerpt
175
-     *       @type string $thumbnail URL to thumbnail
176
-     *       @type array  $category Taxonomy details for the plugin's category {
177
-     *         @type int $term_id => int 30
178
-     *         @type string $name => string 'Plugins' (length=7)
179
-     *         @type string $slug => string 'plugins' (length=7)
180
-     *         @type int $term_group => int 0
181
-     *         @type int $term_taxonomy_id => int 30
182
-     *         @type string $taxonomy => string 'download_category' (length=17)
183
-     *         @type string $description => string '' (length=0)
184
-     *         @type int $parent => int 0
185
-     *         @type int $count => int 4
186
-     *         @type string $filter => string 'raw' (length=3)
187
-     *       }
188
-     *       @type array $tags {see $category above}
189
-     *       @type string $textdomain string 'gravityview' (length=11)
190
-     *   }
191
-     *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
192
-     *   @type array $licensing {
193
-     *       @type bool   $enabled Is licensing enabled for the extension
194
-     *       @type string $version Version number
195
-     *       @type string $exp_unit Expiration unit ('years')
196
-     *       @type string $exp_length Expiration length ('1')
197
-     *   }
198
-     *   @type array $files Array of files. Empty if user has no access to the file. {
199
-     *       @type string $file string URL of the file download
200
-     *   }
201
-     * }
165
+	 *   @type array  $info {
166
+	 *       @type string $id int 17
167
+	 *       @type string $slug Extension slug
168
+	 *       @type string $title Extension title
169
+	 *       @type string $create_date in '2018-07-19 20:03:10' format
170
+	 *       @type string $modified_date
171
+	 *       @type string $status
172
+	 *       @type string $link URL to public plugin page
173
+	 *       @type string $content
174
+	 *       @type string $excerpt
175
+	 *       @type string $thumbnail URL to thumbnail
176
+	 *       @type array  $category Taxonomy details for the plugin's category {
177
+	 *         @type int $term_id => int 30
178
+	 *         @type string $name => string 'Plugins' (length=7)
179
+	 *         @type string $slug => string 'plugins' (length=7)
180
+	 *         @type int $term_group => int 0
181
+	 *         @type int $term_taxonomy_id => int 30
182
+	 *         @type string $taxonomy => string 'download_category' (length=17)
183
+	 *         @type string $description => string '' (length=0)
184
+	 *         @type int $parent => int 0
185
+	 *         @type int $count => int 4
186
+	 *         @type string $filter => string 'raw' (length=3)
187
+	 *       }
188
+	 *       @type array $tags {see $category above}
189
+	 *       @type string $textdomain string 'gravityview' (length=11)
190
+	 *   }
191
+	 *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
192
+	 *   @type array $licensing {
193
+	 *       @type bool   $enabled Is licensing enabled for the extension
194
+	 *       @type string $version Version number
195
+	 *       @type string $exp_unit Expiration unit ('years')
196
+	 *       @type string $exp_length Expiration length ('1')
197
+	 *   }
198
+	 *   @type array $files Array of files. Empty if user has no access to the file. {
199
+	 *       @type string $file string URL of the file download
200
+	 *   }
201
+	 * }
202 202
 	 */
203 203
 	public function get_downloads_data() {
204 204
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		) );
227 227
 
228 228
 		if ( is_wp_error( $response ) ) {
229
-		    gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
229
+			gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
230 230
 			return $response;
231 231
 		}
232 232
 
@@ -279,10 +279,10 @@  discard block
 block discarded – undo
279 279
                 <div class="gv-admin-installer-notice notice inline error">
280 280
                     <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3>
281 281
                     <?php
282
-                    if ( is_wp_error( $downloads_data ) ) {
283
-	                    echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
284
-                    }
285
-                    ?>
282
+					if ( is_wp_error( $downloads_data ) ) {
283
+						echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
284
+					}
285
+					?>
286 286
                 </div>
287 287
             </div>
288 288
 			<?php
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
 	protected function render_download( $download, $wp_plugins ) {
339 339
 
340 340
 
341
-        $details = $this->get_download_display_details( $download, $wp_plugins );
341
+		$details = $this->get_download_display_details( $download, $wp_plugins );
342 342
 
343
-        $download_info = $details['download_info'];
343
+		$download_info = $details['download_info'];
344 344
 
345 345
 		?>
346 346
         <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
@@ -362,43 +362,43 @@  discard block
 block discarded – undo
362 362
 
363 363
                 <div class="addon-excerpt"><?php
364 364
 
365
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
365
+					$excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
366 366
 
367
-                    // Allow some pure HTML tags, but remove everything else from the excerpt.
368
-                    $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
369
-                    $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
367
+					// Allow some pure HTML tags, but remove everything else from the excerpt.
368
+					$tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
369
+					$replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
370 370
 
371
-                    $excerpt = str_replace( $tags, $replacements, $excerpt );
372
-                    $excerpt = esc_html( strip_tags( $excerpt ) );
371
+					$excerpt = str_replace( $tags, $replacements, $excerpt );
372
+					$excerpt = esc_html( strip_tags( $excerpt ) );
373 373
 					$excerpt = str_replace( $replacements, $tags, $excerpt );
374 374
 
375 375
 					echo wpautop( $excerpt );
376
-                ?></div>
376
+				?></div>
377 377
             </div>
378 378
         </div>
379 379
 		<?php
380 380
 	}
381 381
 
382 382
 	/**
383
-     * Generates details array for the download to keep the render_download() method a bit tidier
384
-     *
383
+	 * Generates details array for the download to keep the render_download() method a bit tidier
384
+	 *
385 385
 	 * @param array $download Single download, as returned by {@see get_downloads_data}
386 386
 	 * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()}
387 387
 	 *
388 388
 	 * @return array {
389
-     *   @type array $download_info
390
-     *   @type string $plugin_path
391
-     *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
392
-     *   @type string $status_label
393
-     *   @type string $button_title Title attribute to show when hovering over the download's button
394
-     *   @type string $button_class CSS class to use for the button
395
-     *   @type string $button_label Text to use for the download's anchor link
396
-     *   @type string $href URL for the download's button
397
-     *   @type bool   $spinner Whether to show the spinner icon
398
-     *   @type string $item_class CSS class for the download container
399
-     *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
400
-     *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
401
-     * }
389
+	 *   @type array $download_info
390
+	 *   @type string $plugin_path
391
+	 *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
392
+	 *   @type string $status_label
393
+	 *   @type string $button_title Title attribute to show when hovering over the download's button
394
+	 *   @type string $button_class CSS class to use for the button
395
+	 *   @type string $button_label Text to use for the download's anchor link
396
+	 *   @type string $href URL for the download's button
397
+	 *   @type bool   $spinner Whether to show the spinner icon
398
+	 *   @type string $item_class CSS class for the download container
399
+	 *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
400
+	 *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
401
+	 * }
402 402
 	 */
403 403
 	private function get_download_display_details( $download, $wp_plugins ) {
404 404
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 			'slug' => '',
410 410
 			'excerpt' => '',
411 411
 			'link' => '',
412
-            'coming_soon' => false,
412
+			'coming_soon' => false,
413 413
 			'installer_title' => null, // May not be defined
414 414
 			'installer_excerpt' => null, // May not be defined
415 415
 		) );
@@ -451,14 +451,14 @@  discard block
 block discarded – undo
451 451
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
452 452
 		}
453 453
 
454
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
455
-	        $spinner      = false;
456
-	        $status       = 'notinstalled';
457
-	        $status_label = __( 'Coming Soon', 'gravityview' );
458
-	        $button_label = __( 'Learn More', 'gravityview' );
459
-	        $button_class = 'button-primary button-large';
460
-	        $href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
461
-        }
454
+		elseif ( ! empty( $download_info['coming_soon'] ) ) {
455
+			$spinner      = false;
456
+			$status       = 'notinstalled';
457
+			$status_label = __( 'Coming Soon', 'gravityview' );
458
+			$button_label = __( 'Learn More', 'gravityview' );
459
+			$button_class = 'button-primary button-large';
460
+			$href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
461
+		}
462 462
 
463 463
 		// Access but the plugin is not installed
464 464
 		elseif ( ! $wp_plugin ) {
@@ -498,18 +498,18 @@  discard block
 block discarded – undo
498 498
 		}
499 499
 
500 500
 		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
501
-    }
501
+	}
502 502
 
503 503
 	/**
504
-     * Returns the base price for an extension
505
-     *
504
+	 * Returns the base price for an extension
505
+	 *
506 506
 	 * @param array $download
507 507
 	 *
508 508
 	 * @return float Base price for an extension. If not for sale separately, returns 0
509 509
 	 */
510 510
 	private function get_download_base_price( $download ) {
511 511
 
512
-	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
512
+		$base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
513 513
 		$base_price = \GFCommon::to_number( $base_price );
514 514
 
515 515
 		unset( $download['pricing']['amount'] );
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 		}
521 521
 
522 522
 		return floatval( $base_price );
523
-    }
523
+	}
524 524
 
525 525
 	/**
526 526
 	 * Handle AJAX request to activate extension
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 
539 539
 		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
540 540
 			wp_send_json_error( array(
541
-                'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
542
-            ) );
541
+				'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
542
+			) );
543 543
 		}
544 544
 
545 545
 		wp_send_json_success();
@@ -560,10 +560,10 @@  discard block
 block discarded – undo
560 560
 		deactivate_plugins( $data['path'] );
561 561
 
562 562
 		if( is_plugin_active( $data['path'] ) ) {
563
-            wp_send_json_error( array(
564
-                'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
565
-            ) );
566
-        }
563
+			wp_send_json_error( array(
564
+				'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
565
+			) );
566
+		}
567 567
 
568 568
 		wp_send_json_success();
569 569
 	}
Please login to merge, or discard this patch.