Completed
Pull Request — master (#798)
by Zack
06:40 queued 03:29
created
includes/class-gravityview-entry-notes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 		// Make sure the keys are all set
68 68
 		$note = wp_parse_args( $note, $default_note );
69 69
 
70
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
70
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
71 71
 
72 72
 		// If last_error is empty string, there was no error.
73
-		if( empty( $wpdb->last_error ) ) {
73
+		if ( empty( $wpdb->last_error ) ) {
74 74
 			$return = $wpdb->insert_id;
75 75
 		} else {
76 76
 			$return = new WP_Error( 'gravityview-add-note', $wpdb->last_error );
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public static function delete_notes( $note_ids = array() ) {
98 98
 
99
-		if( !is_array( $note_ids ) ) {
99
+		if ( ! is_array( $note_ids ) ) {
100 100
 
101 101
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array. Not processing delete request.', $note_ids );
102 102
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			)
152 152
 		);
153 153
 
154
-		return $results ? $results[0] : false;
154
+		return $results ? $results[ 0 ] : false;
155 155
 	}
156 156
 
157 157
 	/**
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	public static function filter_avatar( $avatar = '', $note ) {
166 166
 
167
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
168
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
167
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
168
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
169 169
 		}
170 170
 
171 171
 		return $avatar;
Please login to merge, or discard this patch.
includes/extensions/entry-notes/partials/note-add-note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@
 block discarded – undo
21 21
 		{email_fields}
22 22
 
23 23
 		<div class="gv-note-content-container">
24
-			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings('content-label'); ?></label>
24
+			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings( 'content-label' ); ?></label>
25 25
 			<textarea name="gv-note-content" id="gv-note-content-{entry_slug}"></textarea>
26 26
 		</div>
27 27
 
28
-		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings('add-note'); ?></button>
28
+		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings( 'add-note' ); ?></button>
29 29
 	</div>
30 30
 </form>
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
includes/admin/field-types/type_html.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	 * @return string
22 22
 	 */
23 23
 	function get_field_desc() {
24
-		return !empty( $this->field['desc'] ) ? $this->field['desc'] : '';
24
+		return ! empty( $this->field[ 'desc' ] ) ? $this->field[ 'desc' ] : '';
25 25
 	}
26 26
 
27 27
 }
Please login to merge, or discard this patch.
includes/admin/field-types/type_checkboxes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	}
23 23
 
24 24
 	function render_input( $override_input = null ) {
25
-		if( isset( $override_input ) ) {
25
+		if ( isset( $override_input ) ) {
26 26
 			echo $override_input;
27 27
 			return;
28 28
 		}
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 		?>
31 31
 		<ul class="gv-setting-list">
32 32
 		<?php
33
-		foreach( $this->field['options'] as $value => $label ) { ?>
34
-			<li <?php if( isset( $label['requires'] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label['requires'] ); } ?>>
33
+		foreach ( $this->field[ 'options' ] as $value => $label ) { ?>
34
+			<li <?php if ( isset( $label[ 'requires' ] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label[ 'requires' ] ); } ?>>
35 35
 				<label>
36 36
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>" type="hidden"
37 37
 				       value="0"/>
38 38
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>"
39 39
 				       id="<?php echo $this->get_field_id(); ?>" type="checkbox"
40 40
 				       value="1" <?php checked( ! empty( $this->value[ $value ] ) ); ?> />
41
-				<?php echo esc_html( $label['label'] ); ?>
41
+				<?php echo esc_html( $label[ 'label' ] ); ?>
42 42
 				</label>
43
-				<?php if( ! empty( $label['desc'] ) ) {
44
-					printf( '<span class="howto">%s</span>', $label['desc'] );
43
+				<?php if ( ! empty( $label[ 'desc' ] ) ) {
44
+					printf( '<span class="howto">%s</span>', $label[ 'desc' ] );
45 45
 				}
46 46
 				?>
47 47
 			</li>
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry = $gravityview_view->getCurrentEntry();
28
-$notes = GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes = GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-signature.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
54 54
 
55 55
 		foreach ( $signature_fields as $field ) {
56
-			unset( $_POST["input_{$field->id}"] );
56
+			unset( $_POST[ "input_{$field->id}" ] );
57 57
 		}
58 58
 	}
59 59
 
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) {
74 74
 
75
-		$context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
75
+		$context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
76 76
 
77
-		if( 'signature' !== $field->type || 'edit' !== $context ) {
77
+		if ( 'signature' !== $field->type || 'edit' !== $context ) {
78 78
 			return $field_content;
79 79
 		}
80 80
 
81 81
 		// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
82 82
 		$entry = GravityView_View::getInstance()->getCurrentEntry();
83
-		$entry = GFAPI::get_entry( $entry['id'] );
83
+		$entry = GFAPI::get_entry( $entry[ 'id' ] );
84 84
 		$entry_value = rgar( $entry, $field->id );
85 85
 
86
-		$_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted
87
-		$_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted
86
+		$_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted
87
+		$_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted
88 88
 
89 89
 		return ''; // Return empty string to force using $_POST values instead
90 90
 	}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-theme-hooks-church-themes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 */
51 51
 	public function if_gravityview_return_true( $has_content = false ) {
52 52
 
53
-		if( ! class_exists( 'GravityView_frontend' ) ) {
53
+		if ( ! class_exists( 'GravityView_frontend' ) ) {
54 54
 			return $has_content;
55 55
 		}
56 56
 
Please login to merge, or discard this patch.
includes/class-admin.php 2 patches
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
176 176
 			8  => __( 'View submitted.', 'gravityview' ),
177 177
 			9  => sprintf(
178
-		        /* translators: Date and time the View is scheduled to be published */
178
+				/* translators: Date and time the View is scheduled to be published */
179 179
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
180 180
 				// translators: Publish box date format, see http://php.net/date
181 181
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -232,7 +232,6 @@  discard block
 block discarded – undo
232 232
 	 *
233 233
 	 * @deprecated since 1.12
234 234
 	 * @see GravityView_Compatibility::get_plugin_status()
235
-
236 235
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
237 236
 	 */
238 237
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 	function __construct() {
6 6
 
7
-		if( ! is_admin() ) { return; }
7
+		if ( ! is_admin() ) { return; }
8 8
 
9 9
 		// If Gravity Forms isn't active or compatibile, stop loading
10
-		if( false === GravityView_Compatibility::is_valid() ) {
10
+		if ( false === GravityView_Compatibility::is_valid() ) {
11 11
 			return;
12 12
 		}
13 13
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
26 26
 
27 27
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
28
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
28
+		if ( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && ! GFForms::is_gravity_page() ) {
29 29
 			require_once( GFCommon::get_base_path() . '/tooltips.php' );
30 30
 		}
31 31
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
54 54
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
55 55
 
56
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
56
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
57 57
 
58 58
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
59 59
 
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	 */
69 69
 	public static function no_views_text() {
70 70
 		
71
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
71
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
72 72
 			return __( 'No Views found in Trash', 'gravityview' );
73
-		} elseif( ! empty( $_GET['s'] ) ) {
73
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
74 74
 			return __( 'No Views found.', 'gravityview' );
75 75
 		}
76 76
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 			$error .= ' ' . esc_html__( 'Select another form as the data source for this View.', 'gravityview' );
114 114
 		}
115 115
 
116
-		if( $error ) {
116
+		if ( $error ) {
117 117
 			?>
118 118
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
119 119
 				<?php echo gravityview_get_floaty(); ?>
@@ -132,22 +132,22 @@  discard block
 block discarded – undo
132 132
 	public function backend_actions() {
133 133
 
134 134
 		/** @define "GRAVITYVIEW_DIR" "../" */
135
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
136
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
137
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
138
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
139
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
140
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
141
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
142
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
143
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
135
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
136
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
137
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
139
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
140
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
141
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
142
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
143
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
144 144
 
145 145
 		/**
146 146
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
147 147
 		 *
148 148
 		 * Nice place to insert extensions' backend stuff
149 149
 		 */
150
-		do_action('gravityview_include_backend_actions');
150
+		do_action( 'gravityview_include_backend_actions' );
151 151
 	}
152 152
 
153 153
 	/**
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
 
164 164
 		$actions = array();
165 165
 
166
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
167
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
166
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
167
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
168 168
 		}
169 169
 
170
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
171
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
170
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
171
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
172 172
 		}
173 173
 
174 174
 		return array_merge( $actions, $links );
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		// By default, there will only be one item being modified.
197 197
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
198 198
 		// of modified items that will override this array.
199
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
199
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
200 200
 
201 201
 		// If we're starting fresh, a new form was created.
202 202
 		// We should let the user know this is the case.
@@ -204,60 +204,60 @@  discard block
 block discarded – undo
204 204
 
205 205
 		$new_form_text = '';
206 206
 
207
-		if( !empty( $start_fresh ) ) {
207
+		if ( ! empty( $start_fresh ) ) {
208 208
 
209 209
 			// Get the form that was created
210 210
 			$connected_form = gravityview_get_form_id( $post_id );
211 211
 
212
-			if( !empty( $connected_form ) ) {
212
+			if ( ! empty( $connected_form ) ) {
213 213
 				$form = gravityview_get_form( $connected_form );
214
-				$form_name = esc_attr( $form['title'] );
214
+				$form_name = esc_attr( $form[ 'title' ] );
215 215
 				$image = self::get_floaty();
216
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
217
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
216
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
217
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
218 218
 
219 219
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
220
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
220
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
221 221
 				$new_form_text = wpautop( $new_form_text );
222 222
 
223 223
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
224 224
 			}
225 225
 		}
226 226
 
227
-		$messages['gravityview'] = array(
227
+		$messages[ 'gravityview' ] = array(
228 228
 			0  => '', // Unused. Messages start at index 1.
229 229
 			/* translators: %s and %s are HTML tags linking to the View on the website */
230
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
230
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
231 231
 			/* translators: %s and %s are HTML tags linking to the View on the website */
232
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
232
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
233 233
 			3  => __( 'View deleted.', 'gravityview' ),
234 234
 			/* translators: %s and %s are HTML tags linking to the View on the website */
235
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
235
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
236 236
 			/* translators: %s: date and time of the revision */
237
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
237
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
238 238
 			/* translators: %s and %s are HTML tags linking to the View on the website */
239
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
239
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
240 240
 			/* translators: %s and %s are HTML tags linking to the View on the website */
241
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
241
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
242 242
 			8  => __( 'View submitted.', 'gravityview' ),
243 243
 			9  => sprintf(
244 244
 		        /* translators: Date and time the View is scheduled to be published */
245 245
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
246 246
 				// translators: Publish box date format, see http://php.net/date
247
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
247
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
248 248
 			) . $new_form_text,
249 249
 			/* translators: %s and %s are HTML tags linking to the View on the website */
250
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
250
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
251 251
 
252 252
 			/**
253 253
 			 * These apply to `bulk_post_updated_messages`
254 254
 			 * @file wp-admin/edit.php
255 255
 			 */
256
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
257
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
258
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
259
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
260
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
256
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
257
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
258
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
259
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
260
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
261 261
 		);
262 262
 
263 263
 		return $messages;
@@ -317,29 +317,29 @@  discard block
 block discarded – undo
317 317
 	static function is_admin_page( $hook = '', $page = NULL ) {
318 318
 		global $current_screen, $plugin_page, $pagenow, $post;
319 319
 
320
-		if( ! is_admin() ) { return false; }
320
+		if ( ! is_admin() ) { return false; }
321 321
 
322 322
 		$is_page = false;
323 323
 
324
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
324
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
325 325
 
326
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
326
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
327 327
 
328
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
328
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
329 329
 
330
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
331
-			$gv_post = get_post( intval( $_GET['post'] ) );
332
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
330
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
331
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
332
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
333 333
 		} else {
334
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
334
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
335 335
 		}
336 336
 
337
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
337
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
338 338
 
339 339
 			// $_GET `post_type` variable
340
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
340
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
341 341
 				$is_page = 'single';
342
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
342
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
343 343
 				$is_page = 'settings';
344 344
 			} else {
345 345
 				$is_page = 'views';
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
355 355
 
356 356
 		// If the current page is the same as the compared page
357
-		if( !empty( $page ) ) {
357
+		if ( ! empty( $page ) ) {
358 358
 			return $is_page === $page;
359 359
 		}
360 360
 
@@ -375,6 +375,6 @@  discard block
 block discarded – undo
375 375
  *
376 376
  * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
377 377
  */
378
-function gravityview_is_admin_page($hook = '', $page = NULL) {
378
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
379 379
 	return GravityView_Admin::is_admin_page( $hook, $page );
380 380
 }
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-no-conflict.php 2 patches
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 */
19 19
 	public function __construct() {
20 20
 
21
-		if( ! is_admin() ) { return; }
21
+		if ( ! is_admin() ) { return; }
22 22
 		
23 23
 		$this->add_hooks();
24 24
 	}
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 	 */
33 33
 	private function add_hooks() {
34 34
 		//Hooks for no-conflict functionality
35
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
36
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
35
+		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000 );
36
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9 );
37 37
 
38
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
39
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
40
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
41
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
38
+		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000 );
39
+		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11 );
40
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1 );
41
+		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1 );
42 42
 	}
43 43
 
44 44
 	/**
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	function no_conflict_scripts() {
52 52
 		global $wp_scripts;
53 53
 
54
-		if( ! gravityview_is_admin_page() ) {
54
+		if ( ! gravityview_is_admin_page() ) {
55 55
 			return;
56 56
 		}
57 57
 
58
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
58
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
59 59
 
60
-		if( empty( $no_conflict_mode ) ) {
60
+		if ( empty( $no_conflict_mode ) ) {
61 61
 			return;
62 62
 		}
63 63
 
@@ -110,24 +110,24 @@  discard block
 block discarded – undo
110 110
 	function no_conflict_styles() {
111 111
 		global $wp_styles;
112 112
 
113
-		if( ! gravityview_is_admin_page() ) {
113
+		if ( ! gravityview_is_admin_page() ) {
114 114
 			return;
115 115
 		}
116 116
 
117 117
 		// Dequeue other jQuery styles even if no-conflict is off.
118 118
 		// Terrible-looking tabs help no one.
119
-		if( !empty( $wp_styles->registered ) )  {
120
-			foreach ($wp_styles->registered as $key => $style) {
121
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
119
+		if ( ! empty( $wp_styles->registered ) ) {
120
+			foreach ( $wp_styles->registered as $key => $style ) {
121
+				if ( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
122 122
 					wp_dequeue_style( $key );
123 123
 				}
124 124
 			}
125 125
 		}
126 126
 
127
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
127
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
128 128
 
129 129
 		// If no conflict is off, jQuery will suffice.
130
-		if( empty( $no_conflict_mode ) ) {
130
+		if ( empty( $no_conflict_mode ) ) {
131 131
 			return;
132 132
 		}
133 133
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		/**
155 155
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
156 156
 		 */
157
-		do_action('gravityview_remove_conflicts_after');
157
+		do_action( 'gravityview_remove_conflicts_after' );
158 158
 	}
159 159
 
160 160
 	/**
@@ -178,9 +178,9 @@  discard block
 block discarded – undo
178 178
 
179 179
 		//reset queue
180 180
 		$queue = array();
181
-		foreach( $wp_objects->queue as $object ) {
182
-			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
183
-				$queue[] = $object;
181
+		foreach ( $wp_objects->queue as $object ) {
182
+			if ( in_array( $object, $required_objects ) || preg_match( '/gravityview|gf_|gravityforms/ism', $object ) ) {
183
+				$queue[ ] = $object;
184 184
 			}
185 185
 		}
186 186
 		$wp_objects->queue = $queue;
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
 		//unregistering scripts
191 191
 		$registered = array();
192
-		foreach( $wp_objects->registered as $handle => $script_registration ){
193
-			if( in_array( $handle, $required_objects ) ){
192
+		foreach ( $wp_objects->registered as $handle => $script_registration ) {
193
+			if ( in_array( $handle, $required_objects ) ) {
194 194
 				$registered[ $handle ] = $script_registration;
195 195
 			}
196 196
 		}
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 	 * @param array $registered [description]
206 206
 	 * @param array $scripts    [description]
207 207
 	 */
208
-	private function add_script_dependencies($registered, $scripts) {
208
+	private function add_script_dependencies( $registered, $scripts ) {
209 209
 
210 210
 		//gets all dependent scripts linked to the $scripts array passed
211 211
 		do {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
215 215
 				foreach ( $deps as $dep ) {
216 216
 					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
217
-						$dependents[] = $dep;
217
+						$dependents[ ] = $dep;
218 218
 					}
219 219
 				}
220 220
 			}
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 		// Dequeue other jQuery styles even if no-conflict is off.
118 118
 		// Terrible-looking tabs help no one.
119
-		if( !empty( $wp_styles->registered ) )  {
119
+		if( !empty( $wp_styles->registered ) ) {
120 120
 			foreach ($wp_styles->registered as $key => $style) {
121 121
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
122 122
 					wp_dequeue_style( $key );
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
 		//unregistering scripts
191 191
 		$registered = array();
192
-		foreach( $wp_objects->registered as $handle => $script_registration ){
193
-			if( in_array( $handle, $required_objects ) ){
192
+		foreach( $wp_objects->registered as $handle => $script_registration ) {
193
+			if( in_array( $handle, $required_objects ) ) {
194 194
 				$registered[ $handle ] = $script_registration;
195 195
 			}
196 196
 		}
Please login to merge, or discard this patch.