Completed
Push — master ( 022e44...5d3455 )
by Zack
08:11 queued 31s
created
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/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.
includes/fields/class-gravityview-field-post-image.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -23,16 +23,16 @@  discard block
 block discarded – undo
23 23
 
24 24
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
25 25
 
26
-		unset ( $field_options['search_filter'] );
26
+		unset ( $field_options[ 'search_filter' ] );
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$this->add_field_support('link_to_post', $field_options );
32
+		$this->add_field_support( 'link_to_post', $field_options );
33 33
 
34 34
 		// @since 1.5.4
35
-		$this->add_field_support('dynamic_data', $field_options );
35
+		$this->add_field_support( 'dynamic_data', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$url = $title = $caption = $description = '';
59 59
 
60 60
 		// If there's a |:| match, process. Otherwise, empty array!
61
-		if( preg_match( '/\|\:\|/', $value ) ) {
61
+		if ( preg_match( '/\|\:\|/', $value ) ) {
62 62
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
63 63
 		}
64 64
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) {
89 89
 
90
-		$id = (int) $field->id;
91
-		$form_id = $form['id'];
90
+		$id = (int)$field->id;
91
+		$form_id = $form[ 'id' ];
92 92
 		$input_name = "input_{$id}";
93 93
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
94 94
 		$img_name = null;
@@ -96,16 +96,16 @@  discard block
 block discarded – undo
96 96
 		// Convert |:| to associative array
97 97
 		$img_array = $this->explode_value( $value );
98 98
 
99
-		if( ! empty( $img_array['url'] ) ) {
99
+		if ( ! empty( $img_array[ 'url' ] ) ) {
100 100
 
101
-			$img_name = basename( $img_array['url'] );
101
+			$img_name = basename( $img_array[ 'url' ] );
102 102
 
103 103
 			/**
104 104
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
105 105
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
106 106
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
107 107
 			 */
108
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
108
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
109 109
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
110 110
 			}
111 111
 		}
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 		 * @hack
135 135
 		 */
136 136
 		if ( $img_name ) {
137
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
138
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
137
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
138
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
139 139
 		}
140 140
 
141 141
 		return $gf_post_image_field_output;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	     * @since 1.11
44 44
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
45 45
 	     */
46
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
47
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
46
+        if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
47
+            add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
48 48
 
49 49
             // last resort in case the current user display name don't match any of the defaults
50 50
             add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
      */
63 63
     public function update_user( $form = array(), $entry_id = 0 ) {
64 64
 
65
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
65
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GFUser' ) || empty( $entry_id ) ) {
66 66
             return;
67 67
         }
68 68
 
69 69
         // support for GF User Registration 3.x
70
-        $gf_user_3 =  class_exists('GF_User_Registration') ? true : false;
70
+        $gf_user_3 = class_exists( 'GF_User_Registration' ) ? true : false;
71 71
 
72
-        if( $gf_user_3 ) {
72
+        if ( $gf_user_3 ) {
73 73
             $gf_user_registration = GF_User_Registration::get_instance();
74 74
         }
75 75
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
         /**
87 87
          * @since 1.14
88 88
          */
89
-        if( $gf_user_3 ) {
89
+        if ( $gf_user_3 ) {
90 90
             $config = $gf_user_registration->get_single_submission_feed( $entry, $form );
91 91
         } else {
92 92
             $config = GFUser::get_active_config( $form, $entry );
@@ -102,15 +102,15 @@  discard block
 block discarded – undo
102 102
          */
103 103
         $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
104 104
 
105
-        if( $preserve_role ) {
106
-            $config['meta']['role'] = 'gfur_preserve_role';
105
+        if ( $preserve_role ) {
106
+            $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
107 107
         }
108 108
 
109 109
         /**
110 110
          * Make sure the current display name is not changed with the update user method.
111 111
          * @since 1.15
112 112
          */
113
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
113
+        $config[ 'meta' ][ 'displayname' ] = $this->match_current_display_name( $entry[ 'created_by' ] );
114 114
 
115 115
 
116 116
         /**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         $is_create_feed = ( $config && rgars( $config, $feed_pos ) === 'create' );
128 128
 
129 129
         // Only update if it's a create feed
130
-        if( ! $is_create_feed ) {
130
+        if ( ! $is_create_feed ) {
131 131
             return;
132 132
         }
133 133
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
         add_filter( 'send_email_change_email', '__return_false', 3 );
137 137
 
138 138
         // Trigger the User Registration update user method
139
-        if( $gf_user_3 ) {
139
+        if ( $gf_user_3 ) {
140 140
             $gf_user_registration->update_user( $entry, $form, $config );
141 141
         } else {
142 142
             GFUser::update_user( $entry, $form, $config );
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 
167 167
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
168 168
         //   trigger last resort method at the 'gform_user_updated' hook
169
-        if( false === $format || 'nickname' === $format ) {
169
+        if ( false === $format || 'nickname' === $format ) {
170 170
             $this->_user_before_update = $user;
171 171
             $format = 'nickname';
172 172
         }
@@ -186,18 +186,18 @@  discard block
 block discarded – undo
186 186
     public function generate_display_names( $profileuser ) {
187 187
 
188 188
         $public_display = array();
189
-        $public_display['nickname']  = $profileuser->nickname;
190
-        $public_display['username']  = $profileuser->user_login;
189
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
190
+        $public_display[ 'username' ]  = $profileuser->user_login;
191 191
 
192
-        if ( !empty($profileuser->first_name) )
193
-            $public_display['firstname'] = $profileuser->first_name;
192
+        if ( ! empty( $profileuser->first_name ) )
193
+            $public_display[ 'firstname' ] = $profileuser->first_name;
194 194
 
195
-        if ( !empty($profileuser->last_name) )
196
-            $public_display['lastname'] = $profileuser->last_name;
195
+        if ( ! empty( $profileuser->last_name ) )
196
+            $public_display[ 'lastname' ] = $profileuser->last_name;
197 197
 
198
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
199
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
200
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
198
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
199
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
200
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
201 201
         }
202 202
 
203 203
         $public_display = array_map( 'trim', $public_display );
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
          */
228 228
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
229 229
 
230
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
230
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
231 231
 
232 232
         /**
233 233
          * Don't restore display name:
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
          *   - or we don't need as we found the correct format before updating user.
237 237
          * @since 1.14.4
238 238
          */
239
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
239
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
240 240
             return;
241 241
         }
242 242
 
@@ -262,10 +262,10 @@  discard block
 block discarded – undo
262 262
 
263 263
         $updated = wp_update_user( $restored_user );
264 264
 
265
-        if( is_wp_error( $updated ) ) {
266
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
265
+        if ( is_wp_error( $updated ) ) {
266
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
267 267
         } else {
268
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
268
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
269 269
         }
270 270
 
271 271
         $this->_user_before_update = null;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	private function addon_specific_hooks() {
101 101
 
102
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
102
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
104 104
 		}
105 105
 
106 106
 	}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      */
147 147
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148 148
 
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
149
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
150 150
 
151 151
         $base = gv_entry_link( $entry, $post_id );
152 152
 
@@ -160,9 +160,9 @@  discard block
 block discarded – undo
160 160
 	     * Allow passing params to dynamically populate entry with values
161 161
 	     * @since 1.9.2
162 162
 	     */
163
-	    if( !empty( $field_values ) ) {
163
+	    if ( ! empty( $field_values ) ) {
164 164
 
165
-		    if( is_array( $field_values ) ) {
165
+		    if ( is_array( $field_values ) ) {
166 166
 			    // If already an array, no parse_str() needed
167 167
 			    $params = $field_values;
168 168
 		    } else {
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
186 186
 
187
-		if( empty( $context ) || $context !== 'edit' ) {
187
+		if ( empty( $context ) || $context !== 'edit' ) {
188 188
 			return $fields;
189 189
 		}
190 190
 
@@ -226,24 +226,24 @@  discard block
 block discarded – undo
226 226
         // If they can edit any entries (as defined in Gravity Forms)
227 227
         // Or if they can edit other people's entries
228 228
         // Then we're good.
229
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
229
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
230 230
 
231
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
231
+            do_action( 'gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.' );
232 232
 
233 233
             $user_can_edit = true;
234 234
 
235
-        } else if( !isset( $entry['created_by'] ) ) {
235
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
236 236
 
237
-            do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
237
+            do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.' );
238 238
 
239 239
             $user_can_edit = false;
240 240
 
241 241
         } else {
242 242
 
243 243
             // get user_edit setting
244
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
244
+            if ( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
245 245
                 // if View ID not specified or is the current view
246
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
246
+                $user_edit = GravityView_View::getInstance()->getAtts( 'user_edit' );
247 247
             } else {
248 248
                 // in case is specified and not the current view
249 249
                 $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
@@ -252,21 +252,21 @@  discard block
 block discarded – undo
252 252
             $current_user = wp_get_current_user();
253 253
 
254 254
             // User edit is disabled
255
-            if( empty( $user_edit ) ) {
255
+            if ( empty( $user_edit ) ) {
256 256
 
257
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
257
+                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
258 258
 
259 259
                 $user_can_edit = false;
260 260
             }
261 261
 
262 262
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
263
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
263
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
264 264
 
265
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
265
+                do_action( 'gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
266 266
 
267 267
                 $user_can_edit = true;
268 268
 
269
-            } else if( ! is_user_logged_in() ) {
269
+            } else if ( ! is_user_logged_in() ) {
270 270
 
271 271
                 do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
272 272
             }
Please login to merge, or discard this patch.