Completed
Push — develop ( d22d9f...f27933 )
by
unknown
17:42
created
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$this->id         = $item_id;
77 77
 		$this->form_id    = $form_id;
78 78
 		$this->settings   = $settings;
79
-		$this->label_type = $item['label_type'];
79
+		$this->label_type = $item[ 'label_type' ];
80 80
 	}
81 81
 
82 82
 	/**
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
 
121 121
 			foreach ( $field_info_items as $item ) {
122 122
 
123
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
124 124
 					continue;
125 125
 				}
126 126
 
127
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
127
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
128 128
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
129 129
 				$output .= '<span class="' . $class . '">';
130
-				$output .= esc_html( $item['value'] );
130
+				$output .= esc_html( $item[ 'value' ] );
131 131
 				$output .= '</span>';
132 132
 			}
133 133
 
@@ -156,46 +156,46 @@  discard block
 block discarded – undo
156 156
 
157 157
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
158 158
 		// TODO: Un-hack this
159
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
160
-		$settings_link      = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
159
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
160
+		$settings_link = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
161 161
 
162 162
 		// When a field label is empty, use the Field ID
163 163
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
164 164
 
165 165
 		// If there's a custom label, and show label is checked, use that as the field heading
166
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
167
-			$label = $this->settings['custom_label'];
168
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
169
-			$label = $this->item['customLabel'];
166
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
167
+			$label = $this->settings[ 'custom_label' ];
168
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
169
+			$label = $this->item[ 'customLabel' ];
170 170
 		}
171 171
 		$label = esc_attr( $label );
172 172
 
173 173
 		$field_icon = '';
174 174
 
175 175
 		$form = ! empty( $this->form_id ) ? GVCommon::get_form( $this->form_id ) : false;
176
-		$nonexistent_form_field = $form && $this->id && preg_match('/^\d+\.\d+$|^\d+$/', $this->id) && ! gravityview_get_field( $form, $this->id );
176
+		$nonexistent_form_field = $form && $this->id && preg_match( '/^\d+\.\d+$|^\d+$/', $this->id ) && ! gravityview_get_field( $form, $this->id );
177 177
 
178
-		if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
178
+		if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
179 179
 
180
-			$has_gf_icon = ( false !== strpos( $this->item['icon'], 'gform-icon' ) );
181
-			$has_dashicon = ( false !== strpos( $this->item['icon'], 'dashicons' ) );
180
+			$has_gf_icon = ( false !== strpos( $this->item[ 'icon' ], 'gform-icon' ) );
181
+			$has_dashicon = ( false !== strpos( $this->item[ 'icon' ], 'dashicons' ) );
182 182
 
183
-			if ( 0 === strpos( $this->item['icon'], 'data:' ) ) {
183
+			if ( 0 === strpos( $this->item[ 'icon' ], 'data:' ) ) {
184 184
 				// Inline icon SVG
185
-				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item['icon'] ) . '\');"></i>';
186
-			} elseif( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
185
+				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item[ 'icon' ] ) . '\');"></i>';
186
+			} elseif ( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
187 187
 				// Gravity Forms icon font
188
-				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item['icon'] ) . '"></i>';
189
-			} elseif( $has_dashicon ) {
188
+				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
189
+			} elseif ( $has_dashicon ) {
190 190
 				// Dashicon; prefix with "dashicons"
191
-				$field_icon = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i>';
191
+				$field_icon = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
192 192
 			} else {
193 193
 				// Not dashicon icon
194
-				$field_icon = '<i class="' . esc_attr( $this->item['icon'] ) . '"></i>';
194
+				$field_icon = '<i class="' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
195 195
 			}
196 196
 
197 197
 			$field_icon = $field_icon . ' ';
198
-		} elseif( \GV\Utils::get( $this->item, 'parent' ) ) {
198
+		} elseif ( \GV\Utils::get( $this->item, 'parent' ) ) {
199 199
 			$field_icon = '<i class="gv-icon gv-icon-level-down"></i>' . ' ';
200 200
 		}
201 201
 
@@ -222,19 +222,19 @@  discard block
 block discarded – undo
222 222
 
223 223
 		$output .= '</h5>';
224 224
 
225
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
225
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
226 226
 
227 227
 		$container_class .= $nonexistent_form_field ? ' gv-nonexistent-form-field' : '';
228 228
 
229
-		$container_class .= empty( $this->settings['show_as_link'] ) ? '' : ' has-single-entry-link';
229
+		$container_class .= empty( $this->settings[ 'show_as_link' ] ) ? '' : ' has-single-entry-link';
230 230
 
231
-		$container_class .= empty( $this->settings['only_loggedin'] ) ? '' : ' has-custom-visibility';
231
+		$container_class .= empty( $this->settings[ 'only_loggedin' ] ) ? '' : ' has-custom-visibility';
232 232
 
233
-		$data_form_id   = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
233
+		$data_form_id = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
234 234
 
235
-		$data_parent_label = ! empty( $this->item['parent'] ) ? ' data-parent-label="' . esc_attr( $this->item['parent']['label'] ) . '"' : '';
235
+		$data_parent_label = ! empty( $this->item[ 'parent' ] ) ? ' data-parent-label="' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . '"' : '';
236 236
 
237
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
237
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
238 238
 
239 239
 		return $output;
240 240
 	}
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
252 252
 
253 253
 		$icons = array(
254 254
 			'show_as_link' => array(
255
-				'visible' => ( ! empty( $this->settings['show_as_link'] ) ),
255
+				'visible' => ( ! empty( $this->settings[ 'show_as_link' ] ) ),
256 256
 				'title' => __( 'This field links to the Single Entry', 'gravityview' ),
257 257
 				'css_class' => 'dashicons dashicons-media-default icon-link-to-single-entry',
258 258
 			),
259 259
 			'only_loggedin' => array(
260
-				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings['allow_edit_cap'] ) && 'read' !== $this->settings['allow_edit_cap'] ),
260
+				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings[ 'allow_edit_cap' ] ) && 'read' !== $this->settings[ 'allow_edit_cap' ] ),
261 261
 				'title' => __( 'This field has modified visibility', 'gravityview' ),
262 262
 				'css_class' => 'dashicons dashicons-lock icon-custom-visibility',
263 263
 			),
@@ -271,21 +271,21 @@  discard block
 block discarded – undo
271 271
 		 * @param array $icons Array of icons to be shown, with `visible`, `title`, `css_class` keys.
272 272
 		 * @param array $item_settings Settings for the current item (widget or field)
273 273
 		 */
274
-		$icons = (array) apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
274
+		$icons = (array)apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
275 275
 
276 276
 		foreach ( $icons as $icon ) {
277 277
 
278
-			if ( empty( $icon['css_class'] ) || empty( $icon['title'] ) ) {
278
+			if ( empty( $icon[ 'css_class' ] ) || empty( $icon[ 'title' ] ) ) {
279 279
 				continue;
280 280
 			}
281 281
 
282
-			$css_class = trim( $icon['css_class'] );
282
+			$css_class = trim( $icon[ 'css_class' ] );
283 283
 
284
-			if ( empty( $icon['visible'] ) ) {
284
+			if ( empty( $icon[ 'visible' ] ) ) {
285 285
 				$css_class .= ' hide-if-js';
286 286
 			}
287 287
 
288
-			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon['title'] ) . '"></span>';
288
+			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon[ 'title' ] ) . '"></span>';
289 289
 		}
290 290
 
291 291
 		return $output;
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravityformsquiz.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,26 +50,26 @@
 block discarded – undo
50 50
 
51 51
 		if ( ! empty( $quiz_fields ) ) {
52 52
 
53
-			$fields['gquiz_score']   = array(
53
+			$fields[ 'gquiz_score' ] = array(
54 54
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
55 55
 				'type'  => 'quiz_score',
56 56
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
57 57
 				'icon'  => 'dashicons-forms',
58 58
 			);
59
-			$fields['gquiz_percent'] = array(
59
+			$fields[ 'gquiz_percent' ] = array(
60 60
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
61 61
 				'type'  => 'quiz_percent',
62 62
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
63 63
 				'icon'  => 'dashicons-forms',
64 64
 			);
65
-			$fields['gquiz_grade']   = array(
65
+			$fields[ 'gquiz_grade' ] = array(
66 66
 				/* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc.  */
67 67
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
68 68
 				'type'  => 'quiz_grade',
69 69
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
70 70
 				'icon'  => 'dashicons-forms',
71 71
 			);
72
-			$fields['gquiz_is_pass'] = array(
72
+			$fields[ 'gquiz_is_pass' ] = array(
73 73
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
74 74
 				'type'  => 'quiz_is_pass',
75 75
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-textarea.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 
30 30
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
31 31
 
32
-		if( 'edit' === $context ) {
32
+		if ( 'edit' === $context ) {
33 33
 			return $field_options;
34 34
 		}
35 35
 
36
-		unset( $field_options['show_as_link'] );
36
+		unset( $field_options[ 'show_as_link' ] );
37 37
 
38
-		$field_options['trim_words'] = array(
38
+		$field_options[ 'trim_words' ] = array(
39 39
 			'type' => 'number',
40 40
 			'merge_tags' => false,
41 41
 			'value' => null,
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
44 44
 		);
45 45
 
46
-        $field_options['make_clickable'] = array(
46
+        $field_options[ 'make_clickable' ] = array(
47 47
             'type' => 'checkbox',
48 48
             'merge_tags' => false,
49 49
             'value' => 0,
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
52 52
         );
53 53
 
54
-		$field_options['allow_html'] = array(
54
+		$field_options[ 'allow_html' ] = array(
55 55
 			'type' => 'checkbox',
56 56
 			'merge_tags' => false,
57 57
 			'value' => 1,
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gvlogic.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 		$value    = $this->get_value( $atts );
62 62
 
63 63
 		if ( false === $operator && is_null( $value ) ) {
64
-			if ( false !== $atts['if'] ) { // Only-if test
65
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
64
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
65
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
66 66
 			} else {
67 67
 				$match = $authed; // Just login test
68 68
 			}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 				// Need to match all AND
83 83
 				foreach ( $and_values as $and_value ) {
84
-					$match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator );
84
+					$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator );
85 85
 					if ( ! $match ) {
86 86
 						break;
87 87
 					}
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				// Only need to match a single OR
93 93
 				foreach ( $or_values as $or_value ) {
94 94
 
95
-					$match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator );
95
+					$match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator );
96 96
 
97 97
 					// Negate the negative operators
98 98
 					if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 				}
102 102
 
103 103
 			} else {
104
-				$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
104
+				$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
105 105
 			}
106 106
 
107 107
 			$output = $this->get_output( $match, $atts, $output );
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 	 * @return string The output.
190 190
 	 */
191 191
 	private function get_output( $match, $atts, $content ) {
192
-		if ( ! $match && ! empty( $atts['else'] ) ) {
193
-			return $atts['else']; // Attributized else is easy :)
192
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
193
+			return $atts[ 'else' ]; // Attributized else is easy :)
194 194
 		}
195 195
 
196 196
 		$if = '';
@@ -317,18 +317,18 @@  discard block
 block discarded – undo
317 317
 		$atts = array_intersect_key( $supplied_atts, $atts );
318 318
 
319 319
 		// Strip whitespace if it's not default false
320
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
321
-			$atts['if'] = trim( $atts['if'] );
320
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
321
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
322 322
 		} else {
323
-			$atts['if'] = false;
323
+			$atts[ 'if' ] = false;
324 324
 		}
325 325
 
326
-		if ( isset( $atts['logged_in'] ) ) {
326
+		if ( isset( $atts[ 'logged_in' ] ) ) {
327 327
 			// Truthy
328
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
329
-				$atts['logged_in'] = false;
328
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
329
+				$atts[ 'logged_in' ] = false;
330 330
 			} else {
331
-				$atts['logged_in'] = true;
331
+				$atts[ 'logged_in' ] = true;
332 332
 			}
333 333
 		}
334 334
 
Please login to merge, or discard this patch.
includes/extensions/lightbox/class-gravityview-lightbox-provider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 		add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 4 );
24 24
 		add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
25 25
 
26
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
27
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
26
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
27
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
28 28
 
29 29
 		add_action( 'gravityview/template/after', array( $this, 'print_scripts' ) );
30 30
 
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 		remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 );
93 93
 		remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
94 94
 
95
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
96
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
95
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
96
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
97 97
 
98 98
 		remove_action( 'wp_footer', array( $this, 'output_footer' ) );
99 99
 	}
Please login to merge, or discard this patch.
includes/admin/entry-list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
12 12
 
13 13
 		// Add script to enable edit link
14
-		add_action( 'admin_head', array( $this, 'add_edit_script') );
14
+		add_action( 'admin_head', array( $this, 'add_edit_script' ) );
15 15
 	}
16 16
 
17 17
 	/**
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 			'page' => 'gf_entries',
61 61
 			'view' => 'entry',
62 62
 			'id'	=> (int)$form_id,
63
-			'lid'	=>	(int)$lead["id"],
63
+			'lid'	=>	(int)$lead[ "id" ],
64 64
 			'screen_mode'	=> 'edit',
65 65
 		);
66 66
 		?>
67 67
 
68 68
 		<span class="edit edit_entry">
69 69
 			|
70
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
70
+		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
71 71
 		</span>
72 72
 		<?php
73 73
 	}
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/metaboxes/tooltips', array( $this, 'tooltips') );
41
+        add_filter( 'gravityview/metaboxes/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, 6 );
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
      */
78 78
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
79 79
 
80
-        if( $zone !== 'edit' ) {
80
+        if ( $zone !== 'edit' ) {
81 81
 
82
-            $entry_default_fields['edit_link'] = array(
83
-                'label' => __('Link to Edit Entry', 'gravityview'),
82
+            $entry_default_fields[ 'edit_link' ] = array(
83
+                'label' => __( 'Link to Edit Entry', 'gravityview' ),
84 84
                 'type' => 'edit_link',
85
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
85
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
86 86
                 'icon' => 'dashicons-welcome-write-blog',
87 87
             );
88 88
 
@@ -107,12 +107,12 @@  discard block
 block discarded – undo
107 107
         $caps = $visibility_caps;
108 108
 
109 109
         // If we're configuring fields in the edit context, we want a limited selection
110
-        if( $context === 'edit' ) {
110
+        if ( $context === 'edit' ) {
111 111
 
112 112
             // Remove other built-in caps.
113
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
113
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
114 114
 
115
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
115
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
116 116
         }
117 117
 
118 118
         return $caps;
@@ -132,20 +132,20 @@  discard block
 block discarded – undo
132 132
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
133 133
 
134 134
         // Always a link, never a filter
135
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
135
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
136 136
 
137 137
         // Edit Entry link should only appear to visitors capable of editing entries
138
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
138
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
139 139
 
140
-        $add_option['edit_link'] = array(
140
+        $add_option[ 'edit_link' ] = array(
141 141
             'type' => 'text',
142 142
             'label' => __( 'Edit Link Text', 'gravityview' ),
143 143
             'desc' => NULL,
144
-            'value' => __('Edit Entry', 'gravityview'),
144
+            'value' => __( 'Edit Entry', 'gravityview' ),
145 145
             'merge_tags' => true,
146 146
         );
147 147
 
148
-	    $add_option['new_window'] = array(
148
+	    $add_option[ 'new_window' ] = array(
149 149
 		    'type' => 'checkbox',
150 150
 		    'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
151 151
 		    'value' => false,
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 
166 166
         $return = $tooltips;
167 167
 
168
-        $return['allow_edit_cap'] = array(
169
-            'title' => __('Limiting Edit Access', 'gravityview'),
170
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
168
+        $return[ 'allow_edit_cap' ] = array(
169
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
170
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
171 171
         );
172 172
 
173 173
         return $return;
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
189 189
 
190 190
         // We only want to modify the settings for the edit context
191
-        if( 'edit' !== $context ) {
191
+        if ( 'edit' !== $context ) {
192 192
             return $field_options;
193 193
         }
194 194
 
195 195
         //  Entry field is only for logged in users
196
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
196
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
197 197
 
198 198
         $add_options = array(
199 199
             'allow_edit_cap' => array(
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		if ( ! empty( $passed_post ) ) {
22 22
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
23
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
23
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
24 24
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
25 25
 					$this->views->add( \GV\View::by_id( $view_id ) );
26 26
 				}
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 			foreach ( $passed_post as &$post ) {
79 79
 				$views = \GV\View_Collection::from_post( $post );
80 80
 				foreach ( $views->all() as $view ) {
81
-					$ids []= $view->ID;
81
+					$ids [ ] = $view->ID;
82 82
 
83 83
 					/** And as a side-effect... add each view to the global scope. */
84 84
 					if ( ! $this->views->contains( $view->ID ) ) {
@@ -92,18 +92,18 @@  discard block
 block discarded – undo
92 92
 			if ( is_string( $passed_post ) ) {
93 93
 				$shortcodes = \GV\Shortcode::parse( $passed_post );
94 94
 				foreach ( $shortcodes as $shortcode ) {
95
-					if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
96
-						$ids []= $shortcode->atts['id'];
95
+					if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
96
+						$ids [ ] = $shortcode->atts[ 'id' ];
97 97
 
98 98
 						/** And as a side-effect... add each view to the global scope. */
99
-						if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
100
-							$this->views->add( $shortcode->atts['id'] );
99
+						if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
100
+							$this->views->add( $shortcode->atts[ 'id' ] );
101 101
 						}
102 102
 					}
103 103
 				}
104 104
 			} else {
105 105
 				$id = $this->get_id_from_atts( $passed_post );
106
-				$ids[] = intval( $id );
106
+				$ids[ ] = intval( $id );
107 107
 			}
108 108
 		}
109 109
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		// If it's just one ID, return that.
115 115
 		// Otherwise, return array of IDs
116
-		return ( count( $ids ) === 1 ) ? $ids[0] : $ids;
116
+		return ( count( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
117 117
 	}
118 118
 
119 119
 	/**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 */
122 122
 	public static function getInstance( $passed_post = NULL ) {
123 123
 
124
-		if( empty( self::$instance ) ) {
124
+		if ( empty( self::$instance ) ) {
125 125
 			self::$instance = new GravityView_View_Data( $passed_post );
126 126
 		}
127 127
 
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
 			return array();
138 138
 		}
139 139
 		return array_combine(
140
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
141
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
140
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
141
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
142 142
 		);
143 143
 	}
144 144
 
@@ -252,22 +252,22 @@  discard block
 block discarded – undo
252 252
 	public function parse_post_content( $content ) {
253 253
 		$ids = array();
254 254
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
255
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
256
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
257
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
255
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
256
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
257
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
258 258
 				}
259 259
 				/**
260 260
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
261 261
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
262 262
 				 * until better times.
263 263
 				 */
264
-				$ids []= $shortcode->atts['id'];
264
+				$ids [ ] = $shortcode->atts[ 'id' ];
265 265
 			}
266 266
 		}
267 267
 		if ( empty ( $ids ) ) {
268 268
 			return null;
269 269
 		}
270
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
270
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
271 271
 	}
272 272
 
273 273
 	/**
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// Not invalid if not set!
291 291
 		if ( empty( $post_id ) || empty( $view_id ) ) {
292 292
 
293
-			if( $empty_is_valid ) {
293
+			if ( $empty_is_valid ) {
294 294
 				return true;
295 295
 			}
296 296
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
324 324
 
325 325
 			// The post or page specified does not contain the shortcode.
326
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
326
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
327 327
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
328 328
 			}
329 329
 		}
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 		if ( ! $message ) {
332 332
 			// It's a View
333 333
 			if ( \GV\View::exists( $post_id ) ) {
334
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
334
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
335 335
 			}
336 336
 		}
337 337
 
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
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 	 * @since 1.0
34 34
 	 */
35 35
 	public function __construct() {
36
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
36
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
37 37
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
38
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
39
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
38
+		add_action( 'admin_init', array( $this, 'welcome' ) );
39
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
40 40
 	}
41 41
 
42 42
 	/**
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 		// Add help page to GravityView menu
52 52
 		add_submenu_page(
53 53
 			'edit.php?post_type=gravityview',
54
-			__('GravityView: Getting Started', 'gravityview'),
55
-			__('Getting Started', 'gravityview'),
54
+			__( 'GravityView: Getting Started', 'gravityview' ),
55
+			__( 'Getting Started', 'gravityview' ),
56 56
 			$this->minimum_capability,
57 57
 			'gv-getting-started',
58 58
 			array( $this, 'getting_started_screen' )
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 	 *
86 86
 	 * @return boolean  $is_page   True: yep; false: nope
87 87
 	 */
88
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
88
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
89 89
 		global $plugin_page;
90 90
 
91
-		if($is_page) { return $is_page; }
91
+		if ( $is_page ) { return $is_page; }
92 92
 
93 93
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
94 94
 	}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
106 106
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
107 107
 
108
-		if( !$this->is_dashboard_page() ) { return; }
108
+		if ( ! $this->is_dashboard_page() ) { return; }
109 109
 
110 110
 		?>
111 111
 		<style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html">
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		// Don't fetch -beta, etc.
129 129
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
130 130
 
131
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
131
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
132 132
 
133 133
 		echo gravityview_get_floaty( 132 );
134 134
 		?>
@@ -137,13 +137,13 @@  discard block
 block discarded – undo
137 137
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
138 138
 
139 139
 		<h2 class="nav-tab-wrapper clear">
140
-			<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' ) ) ); ?>">
140
+			<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' ) ) ); ?>">
141 141
 				<?php _e( "Getting Started", 'gravityview' ); ?>
142 142
 			</a>
143
-			<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' ) ) ); ?>">
143
+			<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' ) ) ); ?>">
144 144
 				<?php _e( "List of Changes", 'gravityview' ); ?>
145 145
 			</a>
146
-			<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' ) ) ); ?>">
146
+			<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' ) ) ); ?>">
147 147
 				<?php _e( 'Credits', 'gravityview' ); ?>
148 148
 			</a>
149 149
 		</h2>
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 					<h3>Create a View</h3>
178 178
 
179 179
 					<ol class="ol-decimal">
180
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
180
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
181 181
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
182 182
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
183 183
 						<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>.
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 					</ul>
632 632
 
633 633
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
634
-					<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/gravityview/GravityView">', '</a>' ); ?></p>
634
+					<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/gravityview/GravityView">', '</a>' ); ?></p>
635 635
 				</div>
636 636
 			</div>
637 637
 
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 		global $plugin_page;
674 674
 
675 675
 		// Bail if we're just editing the plugin
676
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
676
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
677 677
 
678 678
 		// Bail if no activation redirect
679 679
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 		$upgrade = get_option( 'gv_version_upgraded_from' );
685 685
 
686 686
 		// Don't do anything if they've already seen the new version info
687
-		if( $upgrade === GravityView_Plugin::version ) {
687
+		if ( $upgrade === GravityView_Plugin::version ) {
688 688
 			return;
689 689
 		}
690 690
 
@@ -692,10 +692,10 @@  discard block
 block discarded – undo
692 692
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
693 693
 
694 694
 		// Bail if activating from network, or bulk
695
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
695
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
696 696
 
697 697
 		// First time install
698
-		if( ! $upgrade ) {
698
+		if ( ! $upgrade ) {
699 699
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
700 700
 		}
701 701
 		// Update
Please login to merge, or discard this patch.