Completed
Push — develop ( fd73f3...bfe691 )
by Zack
19:17 queued 05:18
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.
future/includes/class-gv-settings-addon.php 1 patch
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -138,20 +138,20 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 
140 140
 	/**
141
-     * Uninstall all traces of GravityView
142
-     *
143
-     * Note: method is public because parent method is public
144
-     *
141
+	 * Uninstall all traces of GravityView
142
+	 *
143
+	 * Note: method is public because parent method is public
144
+	 *
145 145
 	 * @return bool
146 146
 	 */
147 147
 	public function uninstall() {
148 148
 		gravityview()->plugin->uninstall();
149 149
 
150 150
 		/**
151
-         * Set the path so that Gravity Forms can de-activate GravityView
152
-         * @see GFAddOn::uninstall_addon
153
-         * @uses deactivate_plugins()
154
-         */
151
+		 * Set the path so that Gravity Forms can de-activate GravityView
152
+		 * @see GFAddOn::uninstall_addon
153
+		 * @uses deactivate_plugins()
154
+		 */
155 155
 		$this->_path = GRAVITYVIEW_FILE;
156 156
 
157 157
 		return true;
@@ -181,42 +181,42 @@  discard block
 block discarded – undo
181 181
 	}
182 182
 
183 183
 	/**
184
-     * Get an array of reasons why the plugin might be uninstalled
185
-     *
186
-     * @since 1.17.5
187
-     *
184
+	 * Get an array of reasons why the plugin might be uninstalled
185
+	 *
186
+	 * @since 1.17.5
187
+	 *
188 188
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
189 189
 	 */
190 190
 	private function get_uninstall_reasons() {
191 191
 		$reasons = array(
192 192
 			'will-continue' => array(
193
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
-            ),
193
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
+			),
195 195
 			'no-longer-need' => array(
196
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
-            ),
196
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
+			),
198 198
 			'doesnt-work' => array(
199
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
-            ),
199
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
+			),
201 201
 			'found-other' => array(
202
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
-            ),
202
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
+			),
205 205
 			'other' => array(
206
-                'label' => esc_html__( 'Other', 'gravityview' ),
207
-            ),
206
+				'label' => esc_html__( 'Other', 'gravityview' ),
207
+			),
208 208
 		);
209 209
 
210 210
 		shuffle( $reasons );
211 211
 
212 212
 		return $reasons;
213
-    }
213
+	}
214 214
 
215 215
 	/**
216
-     * Display a feedback form when the plugin is uninstalled
217
-     *
218
-     * @since 1.17.5
219
-     *
216
+	 * Display a feedback form when the plugin is uninstalled
217
+	 *
218
+	 * @since 1.17.5
219
+	 *
220 220
 	 * @return string HTML of the uninstallation form
221 221
 	 */
222 222
 	public function uninstall_form() {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
297 297
             <ul>
298 298
 				<?php
299
-                $reasons = $this->get_uninstall_reasons();
299
+				$reasons = $this->get_uninstall_reasons();
300 300
 				foreach ( $reasons as $reason ) {
301 301
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
302 302
 				}
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	}
391 391
 
392 392
 	public function app_settings_tab() {
393
-	    parent::app_settings_tab();
393
+		parent::app_settings_tab();
394 394
 
395 395
 		if ( $this->maybe_uninstall() ) {
396
-            echo $this->uninstall_form();
396
+			echo $this->uninstall_form();
397 397
 		}
398
-    }
398
+	}
399 399
 
400 400
 	/**
401 401
 	 * The Settings title
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 	 * @return array The settings.
481 481
 	 */
482 482
 	public function all() {
483
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
483
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
484 484
 	}
485 485
 
486 486
 	/**
@@ -549,8 +549,8 @@  discard block
 block discarded – undo
549 549
                     type="' . $field['type'] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552
-		        implode( ' ', $attributes ) .
553
-		        ' />';
552
+				implode( ' ', $attributes ) .
553
+				' />';
554 554
 
555 555
 		if ( $echo ) {
556 556
 			echo $html;
@@ -568,12 +568,12 @@  discard block
 block discarded – undo
568 568
 	}
569 569
 
570 570
 	/**
571
-     * Check whether GravityView is being saved
572
-     *
573
-     * The generic is_save_postback() is true for all addons
574
-     *
575
-     * @since 2.0.8
576
-     *
571
+	 * Check whether GravityView is being saved
572
+	 *
573
+	 * The generic is_save_postback() is true for all addons
574
+	 *
575
+	 * @since 2.0.8
576
+	 *
577 577
 	 * @return bool
578 578
 	 */
579 579
 	public function is_save_postback() {
@@ -587,16 +587,16 @@  discard block
 block discarded – undo
587 587
 	 */
588 588
 	public function license_key_notice() {
589 589
 
590
-	    if( $this->is_save_postback() ) {
591
-		    $settings = $this->get_posted_settings();
592
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
593
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
-        } else {
595
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
596
-		    $license_key    = $this->get( 'license_key' );
597
-	    }
590
+		if( $this->is_save_postback() ) {
591
+			$settings = $this->get_posted_settings();
592
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
593
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
+		} else {
595
+			$license_status = $this->get( 'license_key_status', 'inactive' );
596
+			$license_key    = $this->get( 'license_key' );
597
+		}
598 598
 
599
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
599
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
600 600
 
601 601
 		$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' );
602 602
 
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 		$update_below = false;
611 611
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
612 612
 
613
-        switch ( $license_status ) {
613
+		switch ( $license_status ) {
614 614
 			/** @since 1.17 */
615 615
 			case 'expired':
616 616
 				$title = __( 'Expired License', 'gravityview' );
@@ -666,12 +666,12 @@  discard block
 block discarded – undo
666 666
 	}
667 667
 
668 668
 	/**
669
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
-     *
671
-     * @since 1.21.5
672
-     *
673
-     * @see GFAddOn::scripts()
674
-     *
669
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
+	 *
671
+	 * @since 1.21.5
672
+	 *
673
+	 * @see GFAddOn::scripts()
674
+	 *
675 675
 	 * @return array Array of scripts
676 676
 	 */
677 677
 	public function scripts() {
@@ -680,10 +680,10 @@  discard block
 block discarded – undo
680 680
 		$scripts[] = array(
681 681
 			'handle'  => 'gform_tooltip_init',
682 682
 			'enqueue' => array(
683
-                array(
684
-			        'admin_page' => array( 'app_settings' )
685
-                )
686
-            )
683
+				array(
684
+					'admin_page' => array( 'app_settings' )
685
+				)
686
+			)
687 687
 		);
688 688
 
689 689
 		return $scripts;
@@ -701,10 +701,10 @@  discard block
 block discarded – undo
701 701
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
702 702
 			'version' => Plugin::$version,
703 703
 			'deps' => array(
704
-                'gform_admin',
704
+				'gform_admin',
705 705
 				'gaddon_form_settings_css',
706
-                'gform_tooltip',
707
-                'gform_font_awesome',
706
+				'gform_tooltip',
707
+				'gform_font_awesome',
708 708
 			),
709 709
 			'enqueue' => array(
710 710
 				array( 'admin_page' => array(
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
 					array(
873 873
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
874 874
 						'value' => '1',
875
-                        'name'  => 'beta',
875
+						'name'  => 'beta',
876 876
 					),
877 877
 				),
878 878
 				'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' ),
@@ -910,38 +910,38 @@  discard block
 block discarded – undo
910 910
 
911 911
 			if ( empty( $field['disabled'] ) ) {
912 912
 				unset( $field['disabled'] );
913
-            }
913
+			}
914 914
 		}
915 915
 
916
-        $sections = array(
917
-            array(
918
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
-                'fields'      => $fields,
920
-            )
921
-        );
916
+		$sections = array(
917
+			array(
918
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
+				'fields'      => $fields,
920
+			)
921
+		);
922 922
 
923
-        // custom 'update settings' button
924
-        $button = array(
925
-            'class' => 'button button-primary button-hero',
926
-            'type' => 'save',
927
-        );
923
+		// custom 'update settings' button
924
+		$button = array(
925
+			'class' => 'button button-primary button-hero',
926
+			'type' => 'save',
927
+		);
928 928
 
929 929
 		if ( $disabled_attribute ) {
930 930
 			$button['disabled'] = $disabled_attribute;
931 931
 		}
932 932
 
933
-        /**
934
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
-         * Extensions can tap in here to insert their own section and settings.
936
-         * <code>
937
-         *   $sections[] = array(
938
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
-         *      'fields' => $settings,
940
-         *   );
941
-         * </code>
942
-         * @param array $extension_settings Empty array, ready for extension settings!
943
-         */
944
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
933
+		/**
934
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
+		 * Extensions can tap in here to insert their own section and settings.
936
+		 * <code>
937
+		 *   $sections[] = array(
938
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
+		 *      'fields' => $settings,
940
+		 *   );
941
+		 * </code>
942
+		 * @param array $extension_settings Empty array, ready for extension settings!
943
+		 */
944
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
945 945
 
946 946
 		// If there are extensions, add a section for them
947 947
 		if ( ! empty( $extension_sections ) ) {
@@ -954,13 +954,13 @@  discard block
 block discarded – undo
954 954
 				}
955 955
 			}
956 956
 
957
-            $k = count( $extension_sections ) - 1 ;
958
-            $extension_sections[ $k ]['fields'][] = $button;
957
+			$k = count( $extension_sections ) - 1 ;
958
+			$extension_sections[ $k ]['fields'][] = $button;
959 959
 			$sections = array_merge( $sections, $extension_sections );
960 960
 		} else {
961
-            // add the 'update settings' button to the general section
962
-            $sections[0]['fields'][] = $button;
963
-        }
961
+			// add the 'update settings' button to the general section
962
+			$sections[0]['fields'][] = $button;
963
+		}
964 964
 
965 965
 		return $sections;
966 966
 	}
@@ -1014,9 +1014,9 @@  discard block
 block discarded – undo
1014 1014
 	 */
1015 1015
 	protected function settings_edd_license( $field, $echo = true ) {
1016 1016
 
1017
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
-		    $field['input_type'] = 'password';
1019
-        }
1017
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
+			$field['input_type'] = 'password';
1019
+		}
1020 1020
 
1021 1021
 		$text = $this->settings_text( $field, false );
1022 1022
 
@@ -1033,9 +1033,9 @@  discard block
 block discarded – undo
1033 1033
 
1034 1034
 	/**
1035 1035
 	 * Allow pure HTML settings row
1036
-     *
1037
-     * @since 2.0.6
1038
-     *
1036
+	 *
1037
+	 * @since 2.0.6
1038
+	 *
1039 1039
 	 * @param array $field
1040 1040
 	 * @param bool $echo Whether to echo the
1041 1041
 	 *
@@ -1101,19 +1101,19 @@  discard block
 block discarded – undo
1101 1101
 	}
1102 1102
 
1103 1103
 	/**
1104
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
-     *
1106
-     * Converts `$field['description']` to `$field['gv_description']`
1107
-     * Converts `$field['subtitle']` to `$field['description']`
1108
-     *
1109
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
-     *
1112
-     * @since 1.21.5.2
1113
-     *
1104
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
+	 *
1106
+	 * Converts `$field['description']` to `$field['gv_description']`
1107
+	 * Converts `$field['subtitle']` to `$field['description']`
1108
+	 *
1109
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
+	 *
1112
+	 * @since 1.21.5.2
1113
+	 *
1114 1114
 	 * @param array $field
1115
-     *
1116
-     * @return void
1115
+	 *
1116
+	 * @return void
1117 1117
 	 */
1118 1118
 	public function single_setting_row( $field ) {
1119 1119
 		$field['gv_description'] = Utils::get( $field, 'description' );
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.