Completed
Push — master ( d10a7f...629a27 )
by Zack
9s
created
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     	/**
11 11
     	 * @since  1.5.1
12 12
     	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
13
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
14 14
 
15 15
     	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
16
+    	if ( ! is_admin() ) { return; }
17 17
 
18 18
 	    /**
19 19
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20 20
 	     * @since 1.7.4
21 21
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22 22
 	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
23
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
24 24
 		    return;
25 25
 	    }
26 26
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
          * Use `init` to fix bbPress warning
29 29
          * @see https://bbpress.trac.wordpress.org/ticket/2309
30 30
          */
31
-    	add_action('init', array( $this, 'load'), 100 );
31
+    	add_action( 'init', array( $this, 'load' ), 100 );
32 32
 
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
33
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
34 34
 
35 35
     }
36 36
 
@@ -56,24 +56,24 @@  discard block
 block discarded – undo
56 56
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57 57
 
58 58
     	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
59
+    	if ( empty( $assign_to_lead ) ) {
60 60
     		return;
61 61
     	}
62 62
 
63 63
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
64
+    	$result = RGFormsModel::update_lead_property( $entry[ 'id' ], 'created_by', $user_id, false, true );
65 65
 
66
-    	if( empty( $result ) ) {
67
-    		$status = __('Error', 'gravityview');
66
+    	if ( empty( $result ) ) {
67
+    		$status = __( 'Error', 'gravityview' );
68 68
     	} else {
69
-    		$status = __('Success', 'gravityview');
69
+    		$status = __( 'Success', 'gravityview' );
70 70
     	}
71 71
 
72
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
72
+    	$note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
73 73
 
74
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
74
+    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - ' . $note );
75 75
 
76
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
76
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
77 77
 
78 78
     }
79 79
 
@@ -85,20 +85,20 @@  discard block
 block discarded – undo
85 85
 
86 86
     	// Plugin that was provided here:
87 87
     	// @link https://gravityview.co/support/documentation/201991205/
88
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
89
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
88
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2 );
89
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2 );
90 90
 
91 91
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
92
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
92
+    	if ( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
93 93
 
94 94
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
95 95
 
96 96
     		// Now, no validation is required in the methods; let's hook in.
97
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
97
+    		remove_action( 'admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
98 98
 
99
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
99
+    		remove_action( "gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2 );
100 100
 
101
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
101
+    		remove_action( "gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2 );
102 102
     	}
103 103
 
104 104
     }
@@ -110,26 +110,26 @@  discard block
 block discarded – undo
110 110
     function load() {
111 111
 
112 112
     	// Does GF exist?
113
-        if( !class_exists('GFCommon') ) {
113
+        if ( ! class_exists( 'GFCommon' ) ) {
114 114
             return;
115 115
         }
116 116
 
117 117
         // Can the user edit entries?
118
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
118
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
119 119
             return;
120 120
         }
121 121
 
122 122
         // If screen mode isn't set, then we're in the wrong place.
123
-        if( empty( $_REQUEST['screen_mode'] ) ) {
123
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
124 124
             return;
125 125
         }
126 126
 
127 127
         // Now, no validation is required in the methods; let's hook in.
128
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
128
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
129 129
 
130
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
130
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
131 131
 
132
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
132
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
133 133
 
134 134
     }
135 135
 
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
     function set_screen_mode() {
141 141
 
142 142
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
143
-        if( rgget('screen_mode') === 'edit' ) {
144
-            $_POST["screen_mode"] = 'edit';
143
+        if ( rgget( 'screen_mode' ) === 'edit' ) {
144
+            $_POST[ "screen_mode" ] = 'edit';
145 145
         }
146 146
 
147 147
     }
@@ -152,42 +152,42 @@  discard block
 block discarded – undo
152 152
      * @param  int $entry_id Entry ID
153 153
      * @return void
154 154
      */
155
-    function update_entry_creator($form, $entry_id) {
155
+    function update_entry_creator( $form, $entry_id ) {
156 156
             global $current_user;
157 157
 
158 158
         // Update the entry
159
-        $created_by = absint( rgpost('created_by') );
159
+        $created_by = absint( rgpost( 'created_by' ) );
160 160
 
161 161
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
162 162
 
163 163
         // If the creator has changed, let's add a note about who it used to be.
164
-        $originally_created_by = rgpost('originally_created_by');
164
+        $originally_created_by = rgpost( 'originally_created_by' );
165 165
 
166 166
         // If there's no owner and there didn't used to be, keep going
167
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
167
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
168 168
             return;
169 169
         }
170 170
 
171 171
         // If the values have changed
172
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
172
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
173 173
 
174
-            $user_data = get_userdata($current_user->ID);
174
+            $user_data = get_userdata( $current_user->ID );
175 175
 
176
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
176
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
177 177
 
178
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
178
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
179 179
 
180
-            if( !empty( $originally_created_by ) ) {
181
-                $originally_created_by_user_data = get_userdata($originally_created_by);
180
+            if ( ! empty( $originally_created_by ) ) {
181
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
182 182
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
183 183
             }
184 184
 
185
-            if( !empty( $created_by ) ) {
186
-                $created_by_user_data =  get_userdata($created_by);
185
+            if ( ! empty( $created_by ) ) {
186
+                $created_by_user_data = get_userdata( $created_by );
187 187
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
188 188
             }
189 189
 
190
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
190
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
191 191
         }
192 192
 
193 193
     }
@@ -198,24 +198,24 @@  discard block
 block discarded – undo
198 198
      * @param array $entry    GF entry array
199 199
      * @return void
200 200
      */
201
-    function add_select($form_id, $entry ) {
201
+    function add_select( $form_id, $entry ) {
202 202
 
203
-        if( rgpost('screen_mode') !== 'edit' ) {
203
+        if ( rgpost( 'screen_mode' ) !== 'edit' ) {
204 204
             return;
205 205
         }
206 206
 
207 207
         $users = GVCommon::get_users( 'change_entry_creator' );
208 208
 
209 209
         $output = '<label for="change_created_by">';
210
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
210
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
211 211
         $output .= '</label>
212 212
         <select name="created_by" id="change_created_by" class="widefat">';
213
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
214
-        foreach($users as $user) {
215
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
213
+        $output .= '<option value=""> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
214
+        foreach ( $users as $user ) {
215
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
216 216
         }
217 217
         $output .= '</select>';
218
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
218
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
219 219
         echo $output;
220 220
 
221 221
     }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-tags.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 	var $name = 'post_category';
11 11
 
12
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
12
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
13 13
 
14 14
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
15 15
 
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 
23 23
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
29
-		$this->add_field_support('dynamic_data', $field_options );
30
-		$this->add_field_support('link_to_term', $field_options );
29
+		$this->add_field_support( 'dynamic_data', $field_options );
30
+		$this->add_field_support( 'link_to_term', $field_options );
31 31
 
32 32
 		return $field_options;
33 33
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-checkbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
 	var $name = 'radio';
11 11
 
12
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
12
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
13 13
 
14 14
 	var $_gf_field_class_name = 'GF_Field_Radio';
15 15
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-multiselect.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
 	var $name = 'radio';
11 11
 
12
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
12
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
13 13
 
14 14
 	var $_gf_field_class_name = 'GF_Field_Radio';
15 15
 
Please login to merge, or discard this patch.
gravityview.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -66,20 +66,20 @@  discard block
 block discarded – undo
66 66
 
67 67
 /** Load common & connector functions */
68 68
 require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
69
-require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
70
-require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
69
+require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
70
+require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
71 71
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
72 72
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
73 73
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
74 74
 
75 75
 /** Register Post Types and Rewrite Rules */
76
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
76
+require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
77 77
 
78 78
 /** Add Cache Class */
79
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
79
+require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
80 80
 
81 81
 /** Register hooks that are fired when the plugin is activated and deactivated. */
82
-if( is_admin() ) {
82
+if ( is_admin() ) {
83 83
 	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
84 84
 	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
85 85
 }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	 */
101 101
 	public static function getInstance() {
102 102
 
103
-		if( empty( self::$instance ) ) {
103
+		if ( empty( self::$instance ) ) {
104 104
 			self::$instance = new self;
105 105
 		}
106 106
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	private function __construct() {
111 111
 
112 112
 
113
-		if( ! GravityView_Compatibility::is_valid() ) {
113
+		if ( ! GravityView_Compatibility::is_valid() ) {
114 114
 			return;
115 115
 		}
116 116
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	public function include_files() {
141 141
 
142
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
142
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
143 143
 
144 144
 		// Load fields
145 145
 		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
@@ -150,19 +150,19 @@  discard block
 block discarded – undo
150 150
 			include_once( $gv_field_filename );
151 151
 		}
152 152
 
153
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
154
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
153
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
154
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
155 155
 
156 156
 		// Load Extensions
157 157
 		// @todo: Convert to a scan of the directory or a method where this all lives
158
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
159
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
158
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
159
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
160 160
 
161 161
 		// Load WordPress Widgets
162
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
162
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
163 163
 
164 164
 		// Load GravityView Widgets
165
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
165
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
166 166
 
167 167
 		// Add oEmbed
168 168
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
176 176
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
177 177
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
178
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
178
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
179 179
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
180 180
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
181 181
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	 * @return bool
191 191
 	 */
192 192
 	public static function is_network_activated() {
193
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
193
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
194 194
 	}
195 195
 
196 196
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 * @since 1.7.5.1
256 256
 	 */
257 257
 	public static function include_widget_class() {
258
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
258
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
259 259
 	}
260 260
 
261 261
 
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		}
277 277
 		if ( ! $loaded ) {
278 278
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
279
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
279
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
280 280
 			load_textdomain( 'gravityview', $mofile );
281 281
 		}
282 282
 
@@ -302,12 +302,12 @@  discard block
 block discarded – undo
302 302
 	 */
303 303
 	public function frontend_actions() {
304 304
 
305
-		if( self::is_admin() ) { return; }
305
+		if ( self::is_admin() ) { return; }
306 306
 
307 307
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
308
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
309
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
310
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
308
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
309
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
310
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
311 311
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
312 312
 
313 313
 
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
 	 */
333 333
 	public static function get_default_widget_areas() {
334 334
 		$default_areas = array(
335
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
336
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
335
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
336
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
337 337
 		);
338 338
 
339 339
 		/**
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
      * @param mixed $data Additional data to display
352 352
      * @return void
353 353
      */
354
-    public static function log_debug( $message, $data = null ){
354
+    public static function log_debug( $message, $data = null ) {
355 355
 	    /**
356 356
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
357 357
 	     * @param string $message Message to display
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
      * @param  string $message log message
366 366
      * @return void
367 367
      */
368
-    public static function log_error( $message, $data = null ){
368
+    public static function log_error( $message, $data = null ) {
369 369
 	    /**
370 370
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
371 371
 	     * @param string $message Error message to display
@@ -376,4 +376,4 @@  discard block
 block discarded – undo
376 376
 
377 377
 } // end class GravityView_Plugin
378 378
 
379
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
379
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 	private function add_hooks() {
42 42
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
43 43
 
44
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
44
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
45 45
 
46 46
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
47 47
 
48 48
 		// For the Delete Entry Link, you don't want visible to all users.
49
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
49
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
50 50
 
51 51
 		// Modify the field options based on the name of the field type
52 52
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 		// add template path to check for field
55 55
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
56 56
 
57
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
57
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
58 58
 	}
59 59
 
60 60
 	/**
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	 */
66 66
 	static function getInstance() {
67 67
 
68
-		if( empty( self::$instance ) ) {
68
+		if ( empty( self::$instance ) ) {
69 69
 			self::$instance = new self;
70 70
 		}
71 71
 
@@ -101,20 +101,20 @@  discard block
 block discarded – undo
101 101
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
102 102
 
103 103
 		// Always a link, never a filter
104
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
104
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
105 105
 
106 106
 		// Delete Entry link should only appear to visitors capable of editing entries
107
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
107
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
108 108
 
109
-		$add_option['delete_link'] = array(
109
+		$add_option[ 'delete_link' ] = array(
110 110
 			'type' => 'text',
111 111
 			'label' => __( 'Delete Link Text', 'gravityview' ),
112 112
 			'desc' => NULL,
113
-			'value' => __('Delete Entry', 'gravityview'),
113
+			'value' => __( 'Delete Entry', 'gravityview' ),
114 114
 			'merge_tags' => true,
115 115
 		);
116 116
 
117
-		$field_options['allow_edit_cap'] = array(
117
+		$field_options[ 'allow_edit_cap' ] = array(
118 118
 			'type' => 'select',
119 119
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
120 120
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
 	 */
139 139
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
140 140
 
141
-		$entry_default_fields['delete_link'] = array(
142
-			'label' => __('Delete Entry', 'gravityview'),
141
+		$entry_default_fields[ 'delete_link' ] = array(
142
+			'label' => __( 'Delete Entry', 'gravityview' ),
143 143
 			'type' => 'delete_link',
144
-			'desc'	=> __('A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview'),
144
+			'desc'	=> __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
145 145
 		);
146 146
 
147 147
 		return $entry_default_fields;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 */
155 155
 	function add_available_field( $available_fields = array() ) {
156 156
 
157
-		$available_fields['delete_link'] = array(
157
+		$available_fields[ 'delete_link' ] = array(
158 158
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
159 159
 			'field_id' => 'delete_link',
160 160
 			'label_type' => 'field',
@@ -182,12 +182,12 @@  discard block
 block discarded – undo
182 182
 		$caps = $visibility_caps;
183 183
 
184 184
 		// If we're configuring fields in the edit context, we want a limited selection
185
-		if( $field_id === 'delete_link' ) {
185
+		if ( $field_id === 'delete_link' ) {
186 186
 
187 187
 			// Remove other built-in caps.
188
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
188
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
189 189
 
190
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
190
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
191 191
 		}
192 192
 
193 193
 		return $caps;
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 	 * @param [type] $entry [description]
201 201
 	 */
202 202
 	function set_entry( $entry = null ) {
203
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
203
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
204 204
 	}
205 205
 
206 206
 	/**
@@ -230,13 +230,13 @@  discard block
 block discarded – undo
230 230
 
231 231
         $base = GravityView_API::directory_link( $post_id, true );
232 232
 
233
-		if( empty( $base ) ) {
234
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
233
+		if ( empty( $base ) ) {
234
+			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: ' . $post_id );
235 235
 			return NULL;
236 236
 		}
237 237
 
238 238
 		// Use the slug instead of the ID for consistent security
239
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
239
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
240 240
 
241 241
         $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
242 242
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             'view_id' => $view_id,
248 248
 		), $base );
249 249
 
250
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
250
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
251 251
 
252 252
 		return $url;
253 253
 	}
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
265 265
 
266 266
 		// Only show the link to those who are allowed to see it.
267
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
267
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
268 268
 			return;
269 269
 		}
270 270
 
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
276 276
 
277 277
 		// If the button is hidden by the filter, don't show.
278
-		if( !$show_delete_button ) {
278
+		if ( ! $show_delete_button ) {
279 279
 			return;
280 280
 		}
281 281
 
@@ -305,27 +305,27 @@  discard block
 block discarded – undo
305 305
 	function process_delete() {
306 306
 
307 307
 		// If the form is submitted
308
-		if( 'delete' === RGForms::get("action") && isset( $_GET['entry_id'] ) ) {
308
+		if ( 'delete' === RGForms::get( "action" ) && isset( $_GET[ 'entry_id' ] ) ) {
309 309
 
310 310
 			// Make sure it's a GravityView request
311
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
311
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
312 312
 
313
-			if( ! $valid_nonce_key ) {
314
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
313
+			if ( ! $valid_nonce_key ) {
314
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
315 315
 				return;
316 316
 			}
317 317
 
318 318
 			// Get the entry slug
319
-			$entry_slug = esc_attr( $_GET['entry_id'] );
319
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
320 320
 
321 321
 			// See if there's an entry there
322 322
 			$entry = gravityview_get_entry( $entry_slug );
323 323
 
324
-			if( $entry ) {
324
+			if ( $entry ) {
325 325
 
326 326
 				$has_permission = $this->user_can_delete_entry( $entry );
327 327
 
328
-				if( is_wp_error( $has_permission ) ) {
328
+				if ( is_wp_error( $has_permission ) ) {
329 329
 
330 330
 					$messages = array(
331 331
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -335,9 +335,9 @@  discard block
 block discarded – undo
335 335
 				} else {
336 336
 
337 337
 					// Delete the entry
338
-					$delete_response = $this->delete_or_trash_entry( $entry['id'] );
338
+					$delete_response = $this->delete_or_trash_entry( $entry[ 'id' ] );
339 339
 
340
-					if( is_wp_error( $delete_response ) ) {
340
+					if ( is_wp_error( $delete_response ) ) {
341 341
 
342 342
 						$messages = array(
343 343
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -356,10 +356,10 @@  discard block
 block discarded – undo
356 356
 
357 357
 			} else {
358 358
 
359
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
359
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug ' . $entry_slug );
360 360
 
361 361
 				$messages = array(
362
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
362
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
363 363
 					'status' => 'error',
364 364
 				);
365 365
 			}
@@ -401,14 +401,14 @@  discard block
 block discarded – undo
401 401
 
402 402
 		$mode = $this->get_delete_mode();
403 403
 
404
-		if( 'delete' === $mode ) {
404
+		if ( 'delete' === $mode ) {
405 405
 
406 406
 			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
407 407
 
408 408
 			// Delete the entry
409 409
 			$delete_response = GFAPI::delete_entry( $entry_id );
410 410
 
411
-			if( ! is_wp_error( $delete_response ) ) {
411
+			if ( ! is_wp_error( $delete_response ) ) {
412 412
 				$delete_response = 'deleted';
413 413
 			}
414 414
 
@@ -421,8 +421,8 @@  discard block
 block discarded – undo
421 421
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
422 422
 			new GravityView_Cache;
423 423
 
424
-			if( ! $trashed ) {
425
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
424
+			if ( ! $trashed ) {
425
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
426 426
 			} else {
427 427
 				$delete_response = 'trashed';
428 428
 			}
@@ -442,13 +442,13 @@  discard block
 block discarded – undo
442 442
 	public function verify_nonce() {
443 443
 
444 444
 		// No delete entry request was made
445
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
445
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
446 446
 			return false;
447 447
 		}
448 448
 
449
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
449
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
450 450
 
451
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
451
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
452 452
 
453 453
 		/**
454 454
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 	 */
471 471
 	public static function get_confirm_dialog() {
472 472
 
473
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
473
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
474 474
 
475 475
 		/**
476 476
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		 */
479 479
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
480 480
 
481
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
481
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
482 482
 	}
483 483
 
484 484
 	/**
@@ -496,16 +496,16 @@  discard block
 block discarded – undo
496 496
 
497 497
 		$error = NULL;
498 498
 
499
-		if( ! $this->verify_nonce() ) {
500
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
499
+		if ( ! $this->verify_nonce() ) {
500
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
501 501
 		}
502 502
 
503
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
504
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
503
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
504
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
505 505
 		}
506 506
 
507
-		if( $entry['status'] === 'trash' ) {
508
-			if( 'trash' === $this->get_delete_mode() ) {
507
+		if ( $entry[ 'status' ] === 'trash' ) {
508
+			if ( 'trash' === $this->get_delete_mode() ) {
509 509
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
510 510
 			} else {
511 511
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -513,11 +513,11 @@  discard block
 block discarded – undo
513 513
 		}
514 514
 
515 515
 		// No errors; everything's fine here!
516
-		if( empty( $error ) ) {
516
+		if ( empty( $error ) ) {
517 517
 			return true;
518 518
 		}
519 519
 
520
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
520
+		do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
521 521
 
522 522
 		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
523 523
 	}
@@ -539,32 +539,32 @@  discard block
 block discarded – undo
539 539
 
540 540
 		$current_user = wp_get_current_user();
541 541
 
542
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
542
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
543 543
 
544 544
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
545
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
545
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
546 546
 
547
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
547
+			do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
548 548
 
549 549
 			return true;
550 550
 		}
551 551
 
552 552
 
553 553
 		// If field options are passed, check if current user can view the link
554
-		if( !empty( $field ) ) {
554
+		if ( ! empty( $field ) ) {
555 555
 
556 556
 			// If capability is not defined, something is not right!
557
-			if( empty( $field['allow_edit_cap'] ) ) {
557
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
558 558
 
559 559
 				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
560 560
 
561 561
 				return false;
562 562
 			}
563 563
 
564
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
564
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
565 565
 
566 566
 				// Do not return true if cap is read, as we need to check if the current user created the entry
567
-				if( $field['allow_edit_cap'] !== 'read' ) {
567
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
568 568
 					return true;
569 569
 				}
570 570
 
@@ -577,9 +577,9 @@  discard block
 block discarded – undo
577 577
 
578 578
 		}
579 579
 
580
-		if( !isset( $entry['created_by'] ) ) {
580
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
581 581
 
582
-			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
582
+			do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.' );
583 583
 
584 584
 			return false;
585 585
 		}
@@ -587,24 +587,24 @@  discard block
 block discarded – undo
587 587
 		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
588 588
 
589 589
 		// Only checks user_delete view option if view is already set
590
-		if( $view_id ) {
590
+		if ( $view_id ) {
591 591
 
592 592
 			$current_view = gravityview_get_current_view_data( $view_id );
593 593
 
594
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
594
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
595 595
 
596
-			if( empty( $user_delete ) ) {
596
+			if ( empty( $user_delete ) ) {
597 597
 
598
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
598
+				do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
599 599
 
600 600
 				return false;
601 601
 			}
602 602
 		}
603 603
 
604 604
 		// If the logged-in user is the same as the user who created the entry, we're good.
605
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
605
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
606 606
 
607
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
607
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
608 608
 
609 609
 			return true;
610 610
 		}
@@ -627,31 +627,31 @@  discard block
 block discarded – undo
627 627
 	 */
628 628
 	public function display_message( $current_view_id = 0 ) {
629 629
 
630
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
630
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
631 631
 			return;
632 632
 		}
633 633
 
634 634
 		// Entry wasn't deleted from current View
635
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
635
+		if ( intval( $_GET[ 'gvid' ] ) !== intval( $current_view_id ) ) {
636 636
 			return;
637 637
 		}
638 638
 
639
-		$status = esc_attr( $_GET['status'] );
640
-		$message_from_url = rgget('message');
639
+		$status = esc_attr( $_GET[ 'status' ] );
640
+		$message_from_url = rgget( 'message' );
641 641
 		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
642 642
 		$class = '';
643 643
 
644 644
 		switch ( $status ) {
645 645
 			case 'error':
646 646
 				$class = ' gv-error error';
647
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
647
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
648 648
 				$message = sprintf( $error_message, $message_from_url );
649 649
 				break;
650 650
 			case 'trashed':
651
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
651
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
652 652
 				break;
653 653
 			default:
654
-				$message = __('The entry was successfully deleted.', 'gravityview');
654
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
655 655
 				break;
656 656
 		}
657 657
 
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
666 666
 
667 667
 		// DISPLAY ERROR/SUCCESS MESSAGE
668
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
668
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
669 669
 	}
670 670
 
671 671
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-content.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
22 22
 
23 23
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
24 24
 
25
-		unset( $field_options['show_as_link'] );
25
+		unset( $field_options[ 'show_as_link' ] );
26 26
 
27
-		if( 'edit' === $context ) {
27
+		if ( 'edit' === $context ) {
28 28
 			return $field_options;
29 29
 		}
30 30
 
31
-		$this->add_field_support('dynamic_data', $field_options );
31
+		$this->add_field_support( 'dynamic_data', $field_options );
32 32
 
33 33
 		return $field_options;
34 34
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) {
46 46
 
47
-		$id    = (int) $field->id;
47
+		$id    = (int)$field->id;
48 48
 		$input_name = "input_{$id}";
49 49
 		$class = esc_attr( $field->size );
50 50
 		$tabindex = $field->get_tabindex();
Please login to merge, or discard this patch.
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $group = '' ) {
118 118
 
119
-		if( '' !== $group ) {
119
+		if ( '' !== $group ) {
120 120
 			$return_fields = self::$_fields;
121 121
 			foreach ( $return_fields as $key => $field ) {
122
-				if( $group !== $field->group ) {
122
+				if ( $group !== $field->group ) {
123 123
 					unset( $return_fields[ $key ] );
124 124
 				}
125 125
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
          * If the method changes to public, use Gravity Forms' method
25 25
          * @todo: If/when the method is public, remove the unneeded copied code.
26 26
          */
27
-        if( $reflection->isPublic() ) {
27
+        if ( $reflection->isPublic() ) {
28 28
             return parent::copy_post_image( $url, $post_id );
29 29
         }
30 30
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         }
43 43
 
44 44
         //making sure there is a valid upload folder
45
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
45
+        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir[ 'error' ] ) ) {
46 46
             return false;
47 47
         }
48 48
 
@@ -57,17 +57,17 @@  discard block
 block discarded – undo
57 57
          */
58 58
         $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
59 59
 
60
-        if ( ! file_exists( $upload_dir['path'] ) ) {
61
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
60
+        if ( ! file_exists( $upload_dir[ 'path' ] ) ) {
61
+            if ( ! wp_mkdir_p( $upload_dir[ 'path' ] ) ) {
62 62
                 return false;
63 63
             }
64 64
         }
65 65
 
66 66
         $name     = basename( $url );
67
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
67
+        $filename = wp_unique_filename( $upload_dir[ 'path' ], $name );
68 68
 
69 69
         // the destination path
70
-        $new_file = $upload_dir['path'] . "/$filename";
70
+        $new_file = $upload_dir[ 'path' ] . "/$filename";
71 71
 
72 72
         // the source path
73 73
         $y                = substr( $time, 0, 4 );
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
77 77
         $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
78 78
         $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
79
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
79
+        $path             = str_replace( $upload_root_info[ 'url' ], $upload_root_info[ 'path' ], $url );
80 80
 
81 81
         // copy the file to the destination path
82 82
         if ( ! copy( $path, $new_file ) ) {
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 
86 86
         // Set correct file permissions
87 87
         $stat  = stat( dirname( $new_file ) );
88
-        $perms = $stat['mode'] & 0000666;
88
+        $perms = $stat[ 'mode' ] & 0000666;
89 89
         @ chmod( $new_file, $perms );
90 90
 
91 91
         // Compute the URL
92
-        $url = $upload_dir['url'] . "/$filename";
92
+        $url = $upload_dir[ 'url' ] . "/$filename";
93 93
 
94 94
         if ( is_multisite() ) {
95 95
             delete_transient( 'dirsize_cache' );
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $type = wp_check_filetype( $new_file );
99 99
 
100
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
100
+        return array( 'file' => $new_file, 'url' => $url, 'type' => $type[ 'type' ] );
101 101
 
102 102
     }
103 103
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
          * If the method changes to public, use Gravity Forms' method
125 125
          * @todo: If/when the method is public, remove the unneeded copied code.
126 126
          */
127
-        if( $reflection->isPublic() ) {
127
+        if ( $reflection->isPublic() ) {
128 128
             return parent::media_handle_upload( $url, $post_id, $post_data );
129 129
         }
130 130
 
@@ -145,21 +145,21 @@  discard block
 block discarded – undo
145 145
         }
146 146
 
147 147
         $name_parts = pathinfo( $name );
148
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
148
+        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts[ 'extension' ] ) ) ) );
149 149
 
150
-        $url     = $file['url'];
151
-        $type    = $file['type'];
152
-        $file    = $file['file'];
150
+        $url     = $file[ 'url' ];
151
+        $type    = $file[ 'type' ];
152
+        $file    = $file[ 'file' ];
153 153
         $title   = $name;
154 154
         $content = '';
155 155
 
156 156
         // use image exif/iptc data for title and caption defaults if possible
157 157
         if ( $image_meta = @wp_read_image_metadata( $file ) ) {
158
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
159
-                $title = $image_meta['title'];
158
+            if ( trim( $image_meta[ 'title' ] ) && ! is_numeric( sanitize_title( $image_meta[ 'title' ] ) ) ) {
159
+                $title = $image_meta[ 'title' ];
160 160
             }
161
-            if ( trim( $image_meta['caption'] ) ) {
162
-                $content = $image_meta['caption'];
161
+            if ( trim( $image_meta[ 'caption' ] ) ) {
162
+                $content = $image_meta[ 'caption' ];
163 163
             }
164 164
         }
165 165
 
Please login to merge, or discard this patch.