Completed
Push — master ( 79386d...2cfa6f )
by Zack
18:13 queued 12:52
created
includes/class-gravityview-entry-link-shortcode.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @copydoc GravityView_Entry_Link_Shortcode::shortcode
73 73
 	 */
74 74
 	public function edit_shortcode( $atts, $content = null, $context = 'gv_edit_entry_link' ) {
75
-		$atts['action'] = 'edit';
75
+		$atts[ 'action' ] = 'edit';
76 76
 
77 77
 		return $this->shortcode( $atts, $content, $context );
78 78
 	}
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @copydoc GravityView_Entry_Link_Shortcode::shortcode
86 86
 	 */
87 87
 	public function delete_shortcode( $atts, $content = null, $context = 'gv_delete_entry_link' ) {
88
-		$atts['action'] = 'delete';
88
+		$atts[ 'action' ] = 'delete';
89 89
 
90 90
 		return $this->shortcode( $atts, $content, $context );
91 91
 	}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
 		$this->settings = shortcode_atts( self::$defaults, $atts, $context );
128 128
 
129
-		$this->view_id = empty( $this->settings['view_id'] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings['view_id'] );
129
+		$this->view_id = empty( $this->settings[ 'view_id' ] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings[ 'view_id' ] );
130 130
 
131 131
 		if ( empty( $this->view_id ) ) {
132 132
 			do_action( 'gravityview_log_error', __METHOD__ . ' A View ID was not defined and we are not inside a View' );
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
 			return null;
135 135
 		}
136 136
 
137
-		$this->entry = $this->get_entry( $this->settings['entry_id'] );
137
+		$this->entry = $this->get_entry( $this->settings[ 'entry_id' ] );
138 138
 
139 139
 		do_action( 'gravityview_log_debug', __METHOD__ . ' ' . $context . ' $atts: ', $atts );
140 140
 
141 141
 		if ( ! $this->has_cap() ) {
142
-			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the capability to ' . esc_attr( $this->settings['action'] ) . ' this entry: ' . $this->entry['id'] );
142
+			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the capability to ' . esc_attr( $this->settings[ 'action' ] ) . ' this entry: ' . $this->entry[ 'id' ] );
143 143
 
144 144
 			return null;
145 145
 		}
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		}
154 154
 
155 155
 		// Get just the URL, not the tag
156
-		if ( 'url' === $this->settings['return'] ) {
156
+		if ( 'url' === $this->settings[ 'return' ] ) {
157 157
 			return $url;
158 158
 		}
159 159
 
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
 	 */
175 175
 	private function get_link_atts() {
176 176
 
177
-		wp_parse_str( $this->settings['link_atts'], $link_atts );
177
+		wp_parse_str( $this->settings[ 'link_atts' ], $link_atts );
178 178
 
179
-		if ( 'delete' === $this->settings['action'] ) {
180
-			$link_atts['onclick'] = isset( $link_atts['onclick'] ) ? $link_atts['onclick'] : GravityView_Delete_Entry::get_confirm_dialog();
179
+		if ( 'delete' === $this->settings[ 'action' ] ) {
180
+			$link_atts[ 'onclick' ] = isset( $link_atts[ 'onclick' ] ) ? $link_atts[ 'onclick' ] : GravityView_Delete_Entry::get_confirm_dialog();
181 181
 		}
182 182
 
183
-		return (array) $link_atts;
183
+		return (array)$link_atts;
184 184
 	}
185 185
 
186 186
 	/**
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 			return $content;
201 201
 		}
202 202
 
203
-		switch ( $this->settings['action'] ) {
203
+		switch ( $this->settings[ 'action' ] ) {
204 204
 			case 'edit':
205 205
 				$anchor_text = __( 'Edit Entry', 'gravityview' );
206 206
 				break;
@@ -228,9 +228,9 @@  discard block
 block discarded – undo
228 228
 	private function get_url() {
229 229
 
230 230
 		// if post_id is not defined, default to view_id
231
-		$post_id = empty( $this->settings['post_id'] ) ? $this->view_id : absint( $this->settings['post_id'] );
231
+		$post_id = empty( $this->settings[ 'post_id' ] ) ? $this->view_id : absint( $this->settings[ 'post_id' ] );
232 232
 
233
-		switch ( $this->settings['action'] ) {
233
+		switch ( $this->settings[ 'action' ] ) {
234 234
 			case 'edit':
235 235
 				$url = GravityView_Edit_Entry::get_edit_link( $this->entry, $this->view_id, $post_id );
236 236
 				break;
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private function has_cap() {
257 257
 
258
-		switch ( $this->settings['action'] ) {
258
+		switch ( $this->settings[ 'action' ] ) {
259 259
 			case 'edit':
260 260
 				$has_cap = GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry, $this->view_id );
261 261
 				break;
@@ -320,9 +320,9 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	private function maybe_add_field_values_query_args( $url ) {
322 322
 
323
-		if ( $url && ! empty( $this->settings['field_values'] ) ) {
323
+		if ( $url && ! empty( $this->settings[ 'field_values' ] ) ) {
324 324
 
325
-			wp_parse_str( $this->settings['field_values'], $field_values );
325
+			wp_parse_str( $this->settings[ 'field_values' ], $field_values );
326 326
 
327 327
 			$url = add_query_arg( $field_values, $url );
328 328
 		}
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-admin.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
 
25 25
     function load() {
26 26
 
27
-        if( !is_admin() ) {
27
+        if ( ! is_admin() ) {
28 28
             return;
29 29
         }
30 30
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
         add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
39 39
 
40 40
         // add tooltips
41
-        add_filter( 'gravityview_tooltips', array( $this, 'tooltips') );
41
+        add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
42 42
 
43 43
         // custom fields' options for zone EDIT
44 44
         add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
      */
53 53
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
54 54
 
55
-        if( $zone !== 'edit' ) {
55
+        if ( $zone !== 'edit' ) {
56 56
 
57
-            $entry_default_fields['edit_link'] = array(
58
-                'label' => __('Edit Entry', 'gravityview'),
57
+            $entry_default_fields[ 'edit_link' ] = array(
58
+                'label' => __( 'Edit Entry', 'gravityview' ),
59 59
                 'type' => 'edit_link',
60
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
60
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
61 61
             );
62 62
 
63 63
         }
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
         $caps = $visibility_caps;
82 82
 
83 83
         // If we're configuring fields in the edit context, we want a limited selection
84
-        if( $context === 'edit' ) {
84
+        if ( $context === 'edit' ) {
85 85
 
86 86
             // Remove other built-in caps.
87
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
87
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
88 88
 
89
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
89
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
90 90
         }
91 91
 
92 92
         return $caps;
@@ -104,16 +104,16 @@  discard block
 block discarded – undo
104 104
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
105 105
 
106 106
         // Always a link, never a filter
107
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
107
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
108 108
 
109 109
         // Edit Entry link should only appear to visitors capable of editing entries
110
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
110
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
111 111
 
112
-        $add_option['edit_link'] = array(
112
+        $add_option[ 'edit_link' ] = array(
113 113
             'type' => 'text',
114 114
             'label' => __( 'Edit Link Text', 'gravityview' ),
115 115
             'desc' => NULL,
116
-            'value' => __('Edit Entry', 'gravityview'),
116
+            'value' => __( 'Edit Entry', 'gravityview' ),
117 117
             'merge_tags' => true,
118 118
         );
119 119
 
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 
130 130
         $return = $tooltips;
131 131
 
132
-        $return['allow_edit_cap'] = array(
133
-            'title' => __('Limiting Edit Access', 'gravityview'),
134
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
132
+        $return[ 'allow_edit_cap' ] = array(
133
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
134
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
135 135
         );
136 136
 
137 137
         return $return;
@@ -149,12 +149,12 @@  discard block
 block discarded – undo
149 149
     function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
150 150
 
151 151
         // We only want to modify the settings for the edit context
152
-        if( 'edit' !== $context ) {
152
+        if ( 'edit' !== $context ) {
153 153
 
154 154
             /**
155 155
              * @since 1.8.4
156 156
              */
157
-            $field_options['new_window'] = array(
157
+            $field_options[ 'new_window' ] = array(
158 158
                 'type' => 'checkbox',
159 159
                 'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
160 160
                 'value' => false,
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         }
165 165
 
166 166
         //  Entry field is only for logged in users
167
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
167
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
168 168
 
169 169
         $add_options = array(
170 170
             'allow_edit_cap' => array(
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/inline-javascript.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js( __( "Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview' ) ); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11
-			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
11
+			var mysack = new sack("<?php echo admin_url( "admin-ajax.php" )?>");
12 12
 			mysack.execute = 1;
13 13
 			mysack.method = 'POST';
14 14
 			mysack.setVar( "action", "rg_delete_file" );
15
-			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce("rg_delete_file") ?>" );
15
+			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce( "rg_delete_file" ) ?>" );
16 16
 			mysack.setVar( "lead_id", leadId );
17 17
 			mysack.setVar( "field_id", fieldId );
18 18
 			mysack.setVar( "file_index", fileIndex );
19
-			mysack.onError = function() { alert('<?php echo esc_js(__('Ajax error while deleting field.', 'gravityview')) ?>' )};
19
+			mysack.onError = function() { alert('<?php echo esc_js( __( 'Ajax error while deleting field.', 'gravityview' ) ) ?>' )};
20 20
 			mysack.runAJAX();
21 21
 
22 22
 			return true;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
 extract( $gravityview_view->getCurrentField() );
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty( $field_settings[ 'edit_link' ] ) ? __( 'Edit Entry', 'gravityview' ) : $field_settings[ 'edit_link' ];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty( $field_settings[ 'new_window' ] ) ? '' : 'target="_blank"';
17 17
 
18 18
 $output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
19 19
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@
 block discarded – undo
7 7
 extract( $gravityview_view->getCurrentField() );
8 8
 
9 9
 // Only show the link to logged-in users with the rigth caps.
10
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
10
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
14
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
15 15
 
16 16
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
17 17
 
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
 		$redux_settings = $this->get_redux_settings();
52 52
 
53 53
 		// No need to process
54
-		if( false === $redux_settings ) {
54
+		if ( false === $redux_settings ) {
55 55
 			return;
56 56
 		}
57 57
 
58
-		if( empty(  $redux_settings['license_key_status'] ) ) {
58
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
59 59
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
60 60
 		}
61 61
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
70 70
 
71 71
 		// And now remove the previous option, so this is a one-time thing.
72
-		delete_option('gravityview_settings');
73
-		delete_option('gravityview_settings-transients');
72
+		delete_option( 'gravityview_settings' );
73
+		delete_option( 'gravityview_settings-transients' );
74 74
 	}
75 75
 
76 76
 	/**
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$data = array(
88 88
 			'edd_action' => 'check_license',
89
-			'license' => rgget('license_key', $redux_settings ),
89
+			'license' => rgget( 'license_key', $redux_settings ),
90 90
 			'update' => false,
91 91
 			'format' => 'object',
92 92
 		);
93 93
 
94 94
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
95 95
 
96
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
97
-			$redux_settings['license_key_status'] = $license_call->license;
98
-			$redux_settings['license_key_response'] = json_encode( $license_call );
96
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
97
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
98
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
99 99
 		}
100 100
 
101 101
 		return $redux_settings;
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
 	function get_redux_settings() {
110 110
 
111 111
 		// Previous settings set by Redux
112
-		$redux_option = get_option('gravityview_settings');
112
+		$redux_option = get_option( 'gravityview_settings' );
113 113
 
114 114
 		// No Redux settings? Don't proceed.
115
-		if( false === $redux_option ) {
115
+		if ( false === $redux_option ) {
116 116
 			return false;
117 117
 		}
118 118
 
@@ -122,21 +122,21 @@  discard block
 block discarded – undo
122 122
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
123 123
 		);
124 124
 
125
-		if( $license_array = rgget( 'license', $redux_option ) ) {
125
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
126 126
 
127
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
127
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
128 128
 
129
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
129
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
130 130
 
131 131
 			// This contains the last response for license validation
132
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
132
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
133 133
 
134
-				$saved_license = rgget('license', $saved_values );
134
+				$saved_license = rgget( 'license', $saved_values );
135 135
 
136 136
 				// Only use the last-saved values if they are for the same license
137
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
139
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
137
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
139
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
140 140
 				}
141 141
 			}
142 142
 		}
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	/** ----  Migrate from old search widget to new search widget  ---- */
149 149
 	function update_search_on_views() {
150 150
 
151
-		if( !class_exists('GravityView_Widget_Search') ) {
152
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
151
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
152
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
153 153
 		}
154 154
 
155 155
 		// Loop through all the views
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 
162 162
 		$views = get_posts( $query_args );
163 163
 
164
-		foreach( $views as $view ) {
164
+		foreach ( $views as $view ) {
165 165
 
166 166
 			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
167 167
 			$search_fields = null;
168 168
 
169
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
169
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
170 170
 
171 171
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
172 172
 
173
-			foreach( $widgets as $area => $ws ) {
174
-				foreach( $ws as $k => $widget ) {
175
-					if( $widget['id'] !== 'search_bar' ) { continue; }
173
+			foreach ( $widgets as $area => $ws ) {
174
+				foreach ( $ws as $k => $widget ) {
175
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
176 176
 
177
-					if( is_null( $search_fields ) ) {
177
+					if ( is_null( $search_fields ) ) {
178 178
 						$search_fields = $this->get_search_fields( $view->ID );
179 179
 					}
180 180
 
@@ -182,24 +182,24 @@  discard block
 block discarded – undo
182 182
 					//  [search_free] => 1
183 183
 			        //  [search_date] => 1
184 184
 			        $search_generic = array();
185
-					if( !empty( $widget['search_free'] ) ) {
186
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
185
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
186
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
188
-					if( !empty( $widget['search_date'] ) ) {
189
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
188
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
189
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
190 190
 					}
191 191
 
192 192
 					$search_config = array_merge( $search_generic, $search_fields );
193 193
 
194 194
 					// don't throw '[]' when json_encode an empty array
195
-					if( empty( $search_config ) ) {
195
+					if ( empty( $search_config ) ) {
196 196
 						$search_config = '';
197 197
 					} else {
198 198
 						$search_config = json_encode( $search_config );
199 199
 					}
200 200
 
201
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
202
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
201
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
202
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
203 203
 
204 204
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
205 205
 				}
@@ -227,26 +227,26 @@  discard block
 block discarded – undo
227 227
 		// check view fields' settings
228 228
 		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
229 229
 
230
-		if( !empty( $fields ) && is_array( $fields ) ) {
230
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
231 231
 
232
-			foreach( $fields as $t => $fs ) {
232
+			foreach ( $fields as $t => $fs ) {
233 233
 
234
-				foreach( $fs as $k => $field ) {
234
+				foreach ( $fs as $k => $field ) {
235 235
 					// is field a search_filter ?
236
-					if( empty( $field['search_filter'] ) ) { continue; }
236
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
237 237
 
238 238
 					// get field type & calculate the input type (by default)
239
-					$form_field = gravityview_get_field( $form, $field['id'] );
239
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
240 240
 
241
-					if( empty( $form_field['type'] ) ) {
241
+					if ( empty( $form_field[ 'type' ] ) ) {
242 242
 						continue;
243 243
 					}
244 244
 
245 245
 					// depending on the field type assign a group of possible search field types
246
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
246
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
247 247
 
248 248
 					// add field to config
249
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
249
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
250 250
 
251 251
 				}
252 252
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-admin-duplicate-view.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 	function __construct() {
16 16
 
17 17
 		// Only run on Admin
18
-		if ( !is_admin() ) {
18
+		if ( ! is_admin() ) {
19 19
 			return;
20 20
 		}
21 21
 
22 22
 		// If the Duplicate Post plugin is active, don't run.
23
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
23
+		if ( defined( 'DUPLICATE_POST_CURRENT_VERSION' ) ) {
24 24
 			return;
25 25
 		}
26 26
 
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 		global $post;
61 61
 
62 62
 		// We only want to add Clone links to the Edit View metabox
63
-		if( !$this->is_all_views_page() ) {
63
+		if ( ! $this->is_all_views_page() ) {
64 64
 
65
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
66
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
65
+			if ( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
66
+				$links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>';
67 67
 			}
68 68
 
69 69
 		}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
120 120
 		 * @param WP_Post $post View being cloned
121 121
 		 */
122
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
122
+		$new_view_status = apply_filters( 'gravityview/duplicate-view/status', $status, $post );
123 123
 
124 124
 		$new_view = array(
125 125
 			'menu_order'     => $post->menu_order,
@@ -142,11 +142,11 @@  discard block
 block discarded – undo
142 142
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
143 143
 		 * @param WP_Post $post View being cloned
144 144
 		 */
145
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
145
+		$copy_date = apply_filters( 'gravityview/duplicate-view/copy-date', false, $post );
146 146
 
147 147
 		if ( $copy_date ) {
148
-			$new_view['post_date']     = $new_post_date = $post->post_date;
149
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
148
+			$new_view[ 'post_date' ]     = $new_post_date = $post->post_date;
149
+			$new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date );
150 150
 		}
151 151
 
152 152
 		/**
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
156 156
 		 * @param WP_Post $post View being cloned
157 157
 		 */
158
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
158
+		$new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post );
159 159
 
160 160
 		// Magic happens here.
161 161
 		$new_view_id = wp_insert_post( $new_view );
@@ -237,13 +237,13 @@  discard block
 block discarded – undo
237 237
 			$clone_text = __( 'Clone', 'gravityview' );
238 238
 			$clone_title = __( 'Clone this View', 'gravityview' );
239 239
 
240
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
240
+			$actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title );
241 241
 
242 242
 			$clone_draft_link = $this->get_clone_view_link( $post->ID );
243 243
 			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
244 244
 			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
245 245
 
246
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
246
+			$actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title );
247 247
 		}
248 248
 
249 249
 		return $actions;
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 		}
268 268
 
269 269
 		// Verify the View exists
270
-		if ( !$view = get_post( $id ) ) {
270
+		if ( ! $view = get_post( $id ) ) {
271 271
 			return '';
272 272
 		}
273 273
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 		$post_type_object = get_post_type_object( $view->post_type );
283 283
 
284 284
 		/** If there's no gravityview post type for some reason, abort! */
285
-		if ( !$post_type_object ) {
285
+		if ( ! $post_type_object ) {
286 286
 			do_action( 'gravityview_log_error', __METHOD__ . ' No gravityview post type exists when trying to clone the View.', $view );
287 287
 			return '';
288 288
 		}
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 		 * @param int $view_id View ID
295 295
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
296 296
 		 */
297
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
297
+		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php" . $action ), $view->ID, $context );
298 298
 
299 299
 		return $clone_view_link;
300 300
 	}
@@ -321,14 +321,14 @@  discard block
 block discarded – undo
321 321
 	 */
322 322
 	public function save_as_new_view( $status = '' ) {
323 323
 
324
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
324
+		if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) {
325 325
 			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
326 326
 		}
327 327
 
328 328
 		// Get the original post
329
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
329
+		$id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] );
330 330
 
331
-		if( ! $this->current_user_can_copy( $id ) ) {
331
+		if ( ! $this->current_user_can_copy( $id ) ) {
332 332
 			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
333 333
 		}
334 334
 
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 	 * @since 1.0
35 35
 	 */
36 36
 	public function __construct() {
37
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
37
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
38 38
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
39
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
40
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
39
+		add_action( 'admin_init', array( $this, 'welcome' ) );
40
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
41 41
 	}
42 42
 
43 43
 	/**
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 		// Add help page to GravityView menu
54 54
 		add_submenu_page(
55 55
 			'edit.php?post_type=gravityview',
56
-			__('GravityView: Getting Started', 'gravityview'),
57
-			__('Getting Started', 'gravityview'),
56
+			__( 'GravityView: Getting Started', 'gravityview' ),
57
+			__( 'Getting Started', 'gravityview' ),
58 58
 			$this->minimum_capability,
59 59
 			'gv-getting-started',
60 60
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return boolean  $is_page   True: yep; false: nope
89 89
 	 */
90
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
90
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
91 91
 		global $plugin_page;
92 92
 
93
-		if($is_page) { return $is_page; }
93
+		if ( $is_page ) { return $is_page; }
94 94
 
95 95
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
96 96
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
109 109
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
110 110
 
111
-		if( !$this->is_dashboard_page() ) { return; }
111
+		if ( ! $this->is_dashboard_page() ) { return; }
112 112
 
113 113
 		?>
114 114
 		<style type="text/css" media="screen">
@@ -141,20 +141,20 @@  discard block
 block discarded – undo
141 141
 		// Don't fetch -beta, etc.
142 142
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
143 143
 
144
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
144
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
145 145
 		?>
146 146
 
147 147
 		<h1><img class="alignleft" src="<?php echo plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ); ?>" width="100" height="132" /><?php printf( esc_html__( 'Welcome to GravityView %s', 'gravityview' ), $display_version ); ?></h1>
148 148
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
149 149
 
150 150
 		<h2 class="nav-tab-wrapper clear">
151
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
151
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
152 152
 				<?php _e( "Getting Started", 'gravityview' ); ?>
153 153
 			</a>
154
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
154
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
155 155
 				<?php _e( "List of Changes", 'gravityview' ); ?>
156 156
 			</a>
157
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
157
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
158 158
 				<?php _e( 'Credits', 'gravityview' ); ?>
159 159
 			</a>
160 160
 		</h2>
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 					<h2>Create a View</h2>
191 191
 
192 192
 					<ol class="ol-decimal">
193
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
193
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
194 194
 						<li>If you want to <strong>create a new form</strong>, click the "Start Fresh" button</li>
195 195
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
196 196
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 					</ul>
526 526
 
527 527
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
528
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
528
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
529 529
 				</div>
530 530
 			</div>
531 531
 
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 		global $plugin_page;
566 566
 
567 567
 		// Bail if we're just editing the plugin
568
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
568
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
569 569
 
570 570
 		// Bail if no activation redirect
571 571
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
 		$upgrade = get_option( 'gv_version_upgraded_from' );
577 577
 
578 578
 		// Don't do anything if they've already seen the new version info
579
-		if( $upgrade === GravityView_Plugin::version ) {
579
+		if ( $upgrade === GravityView_Plugin::version ) {
580 580
 			return;
581 581
 		}
582 582
 
@@ -584,10 +584,10 @@  discard block
 block discarded – undo
584 584
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
585 585
 
586 586
 		// Bail if activating from network, or bulk
587
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
587
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
588 588
 
589 589
 		// First time install
590
-		if( ! $upgrade ) {
590
+		if ( ! $upgrade ) {
591 591
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
592 592
 		}
593 593
 		// Update
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		/**
80 80
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
81 81
 		 */
82
-		foreach( $this->lead_db_columns as $column ) {
82
+		foreach ( $this->lead_db_columns as $column ) {
83 83
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
84 84
 		}
85 85
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 			return;
113 113
 		}
114 114
 
115
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
115
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
116 116
 		
117
-		$this->blacklist_add( $entry['form_id'] );
117
+		$this->blacklist_add( $entry[ 'form_id' ] );
118 118
 	}
119 119
 
120 120
 	/**
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function entry_updated( $form, $lead_id ) {
129 129
 
130
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
130
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
131 131
 
132
-		$this->blacklist_add( $form['id'] );
132
+		$this->blacklist_add( $form[ 'id' ] );
133 133
 	}
134 134
 
135 135
 	/**
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function entry_created( $entry, $form ) {
146 146
 
147
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
147
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
148 148
 
149
-		$this->blacklist_add( $form['id'] );
149
+		$this->blacklist_add( $form[ 'id' ] );
150 150
 	}
151 151
 
152 152
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		// Normally just one form, but supports multiple forms
166 166
 		//
167 167
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
168
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
168
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
169 169
 
170 170
 		// Prefix for transient keys
171 171
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
244 244
 
245
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
245
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
246 246
 
247 247
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
248 248
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 			return false;
276 276
 		}
277 277
 
278
-		foreach ( (array) $form_ids as $form_id ) {
278
+		foreach ( (array)$form_ids as $form_id ) {
279 279
 
280 280
 			if ( in_array( $form_id, $blacklist ) ) {
281 281
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
348 348
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
349 349
 			 */
350
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
350
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
351 351
 
352 352
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
353 353
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			return;
384 384
 		}
385 385
 
386
-		foreach ( (array) $form_ids as $form_id ) {
386
+		foreach ( (array)$form_ids as $form_id ) {
387 387
 
388 388
 			$key = $this->get_cache_key_prefix( $form_id );
389 389
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 
498 498
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
499 499
 
500
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
500
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
501 501
 
502 502
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
503 503
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		 */
527 527
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
528 528
 
529
-		return (boolean) $use_cache;
529
+		return (boolean)$use_cache;
530 530
 	}
531 531
 
532 532
 }
Please login to merge, or discard this patch.