Completed
Push — develop ( 1d02d7...3ab570 )
by Zack
10:35
created
includes/admin/class-gravityview-admin-view-field.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,29 +15,29 @@
 block discarded – undo
15 15
 		$field_info_items = array();
16 16
 
17 17
 		// Fields with IDs, not like Source URL or Entry ID
18
-		if( is_numeric( $this->id ) ) {
18
+		if ( is_numeric( $this->id ) ) {
19 19
 
20
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
20
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
21 21
 
22
-			$field_info_items[] = array(
23
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
22
+			$field_info_items[ ] = array(
23
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title )
24 24
 			);
25 25
 
26
-			$field_info_items[] = array(
27
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
26
+			$field_info_items[ ] = array(
27
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
28 28
 			);
29 29
 
30 30
 		}
31 31
 
32
-		if( !empty( $this->item['desc'] ) ) {
33
-			$field_info_items[] = array(
34
-				'value' => $this->item['desc']
32
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
33
+			$field_info_items[ ] = array(
34
+				'value' => $this->item[ 'desc' ]
35 35
 			);
36 36
 		}
37 37
 
38
-		if( !empty( $this->item['adminLabel'] ) ) {
39
-			$field_info_items[] = array(
40
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
38
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
39
+			$field_info_items[ ] = array(
40
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
41 41
 				'class'	=> 'gv-sublabel'
42 42
 			);
43 43
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-workflow_step.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 	function modify_entry_value_workflow_step( $output, $entry, $field_settings, $field ) {
48 48
 
49 49
 		// If not set, the entry hasn't started a workflow
50
-		$has_workflow_step = isset( $entry['workflow_step'] );
50
+		$has_workflow_step = isset( $entry[ 'workflow_step' ] );
51 51
 
52
-		if( $has_workflow_step ) {
52
+		if ( $has_workflow_step ) {
53 53
 
54
-			$GFlow = new Gravity_Flow_API( $entry['form_id'] );
54
+			$GFlow = new Gravity_Flow_API( $entry[ 'form_id' ] );
55 55
 
56 56
 			if ( $current_step = $GFlow->get_current_step( $entry ) ) {
57 57
 				$output = esc_html( $current_step->get_name() );
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		preg_match( '/workflow_step_status_(\d+)/', $key, $matches );
80 80
 
81 81
 		if ( ! empty( $matches ) ) {
82
-			$workflow_step_id = intval( $matches[1] );
82
+			$workflow_step_id = intval( $matches[ 1 ] );
83 83
 		}
84 84
 
85 85
 		return $workflow_step_id;
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 		$return = $label;
100 100
 
101
-		if ( '' === $label && $workflow_step_id = $this->get_step_id_from_key( $field['field'] ) ) {
101
+		if ( '' === $label && $workflow_step_id = $this->get_step_id_from_key( $field[ 'field' ] ) ) {
102 102
 
103 103
 			$step = $this->get_workflow_step( $workflow_step_id );
104 104
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 		$workflow_step = $GFlow->get_step( $workflow_step_id );
130 130
 
131
-		if( ! $GFlow || ! $workflow_step ) {
131
+		if ( ! $GFlow || ! $workflow_step ) {
132 132
 			return false;
133 133
 		}
134 134
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		
151 151
 		foreach ( $search_fields as & $search_field ) {
152 152
 
153
-			if ( $this->name === $search_field['key'] ) {
153
+			if ( $this->name === $search_field[ 'key' ] ) {
154 154
 
155 155
 				$form_id = GravityView_View::getInstance()->getFormId();
156 156
 
@@ -159,21 +159,21 @@  discard block
 block discarded – undo
159 159
 				$choices = array();
160 160
 
161 161
 				foreach ( $workflow_steps as $step ) {
162
-					$choices[] = array(
162
+					$choices[ ] = array(
163 163
 						'text'   => $step->get_name(),
164 164
 						'value'   => $step->get_id(),
165 165
 					);
166 166
 				}
167 167
 
168
-				$search_field['choices'] = $choices;
168
+				$search_field[ 'choices' ] = $choices;
169 169
 			}
170 170
 
171 171
 			// Workflow Step Statuses
172
-			else if ( $workflow_step_id = $this->get_step_id_from_key( $search_field['key'] ) ) {
172
+			else if ( $workflow_step_id = $this->get_step_id_from_key( $search_field[ 'key' ] ) ) {
173 173
 
174 174
 				$status_key = sprintf( 'workflow_step_status_%d', $workflow_step_id );
175 175
 
176
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options( null, $status_key );
176
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options( null, $status_key );
177 177
 			}
178 178
 		}
179 179
 		
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-workflow_final_status.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
43 43
 
44
-		if( ! empty( $output ) ) {
44
+		if ( ! empty( $output ) ) {
45 45
 			$output = gravity_flow()->translate_status_label( $output );
46 46
 		}
47 47
 
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 	function modify_search_filters( $search_fields = array(), GravityView_Widget_Search $widget, $widget_args = array() ) {
60 60
 
61 61
 		foreach ( $search_fields as & $search_field ) {
62
-			if ( $this->name === $search_field['key'] ) {
63
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
62
+			if ( $this->name === $search_field[ 'key' ] ) {
63
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
64 64
 			}
65 65
 		}
66 66
 
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 	}
39 39
 	
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
54 54
 
55
-		if( empty( $form_id ) ) {
55
+		if ( empty( $form_id ) ) {
56 56
 			$form_id = GravityView_View::getInstance()->getFormId();
57 57
 		}
58 58
 
59 59
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
60 60
 
61
-		return (array) rgars( $entry_meta, $status_key . '/filter/choices' );
61
+		return (array)rgars( $entry_meta, $status_key . '/filter/choices' );
62 62
 	}
63 63
 
64 64
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
 		$workflow_steps = $GFlow->get_steps();
82 82
 
83
-		if( $workflow_steps ) {
83
+		if ( $workflow_steps ) {
84 84
 
85 85
 			foreach ( $workflow_steps as $step ) {
86 86
 
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
 				);
93 93
 			}
94 94
 
95
-			$fields['workflow_step'] = array(
95
+			$fields[ 'workflow_step' ] = array(
96 96
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
97 97
 				'type'  => 'select',
98 98
 			);
99 99
 
100
-			$fields['workflow_final_status'] = array(
100
+			$fields[ 'workflow_final_status' ] = array(
101 101
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
102 102
 				'type'  => 'select',
103 103
 			);
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-survey.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
 		$return = $input_type;
47 47
 
48
-		if( 'survey' === $field_type ) {
48
+		if ( 'survey' === $field_type ) {
49 49
 			$return = 'select';
50 50
 		}
51 51
 
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	public function fix_survey_fields( $fields ) {
66 66
 
67 67
 		/** @var GF_Field $field */
68
-		foreach( $fields as &$field ) {
69
-			if( 'survey' === $field->type ) {
68
+		foreach ( $fields as &$field ) {
69
+			if ( 'survey' === $field->type ) {
70 70
 				$field->allowsPrepopulate = true;
71 71
 			}
72 72
 		}
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @return void
83 83
 	 */
84 84
 	function add_render_hooks() {
85
-		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 );
85
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 );
86 86
 	}
87 87
 
88 88
 	/**
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return void
96 96
 	 */
97 97
 	function remove_render_hooks() {
98
-		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 );
98
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 );
99 99
 	}
100 100
 
101 101
 	/**
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function fix_survey_field_value( $value, $field, $name ) {
115 115
 
116
-		if( 'survey' === $field->type ) {
116
+		if ( 'survey' === $field->type ) {
117 117
 
118
-			$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
118
+			$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
119 119
 
120 120
 			// We need to run through each survey row until we find a match for expected values
121 121
 			foreach ( $entry as $field_id => $field_value ) {
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
 					continue;
125 125
 				}
126 126
 
127
-				if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
127
+				if ( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
128 128
 					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
129 129
 
130 130
 					// If the $name matches the $row_val, we are processing the correct row
131
-					if( $row_val === $name ) {
131
+					if ( $row_val === $name ) {
132 132
 						$value = $field_value;
133 133
 						break;
134 134
 					}
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	function __construct( $title = '', $item_id, $item = array(), $settings = array() ) {
43 43
 
44 44
 		// Backward compat
45
-		if ( ! empty( $item['type'] ) ) {
46
-			$item['input_type'] = $item['type'];
47
-			unset( $item['type'] );
45
+		if ( ! empty( $item[ 'type' ] ) ) {
46
+			$item[ 'input_type' ] = $item[ 'type' ];
47
+			unset( $item[ 'type' ] );
48 48
 		}
49 49
 
50 50
 		// Prevent items from not having index set
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		$this->item       = $item;
65 65
 		$this->id         = $item_id;
66 66
 		$this->settings   = $settings;
67
-		$this->label_type = $item['label_type'];
67
+		$this->label_type = $item[ 'label_type' ];
68 68
 	}
69 69
 
70 70
 	/**
@@ -107,10 +107,10 @@  discard block
 block discarded – undo
107 107
 		if ( $html ) {
108 108
 
109 109
 			foreach ( $field_info_items as $item ) {
110
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
110
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
111 111
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
112 112
 				$output .= '<span class="' . $class . '">';
113
-				$output .= esc_html( $item['value'] );
113
+				$output .= esc_html( $item[ 'value' ] );
114 114
 				$output .= '</span>';
115 115
 			}
116 116
 
@@ -138,29 +138,29 @@  discard block
 block discarded – undo
138 138
 
139 139
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
140 140
 		// TODO: Un-hack this
141
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
141
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
142 142
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
143 143
 
144 144
 		// Should we show the icon that the field is being used as a link to single entry?
145
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
145
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
146 146
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
147 147
 
148 148
 		// When a field label is empty, use the Field ID
149 149
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
150 150
 
151 151
 		// If there's a custom label, and show label is checked, use that as the field heading
152
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
153
-			$label = $this->settings['custom_label'];
154
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
155
-			$label = $this->item['customLabel'];
152
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
153
+			$label = $this->settings[ 'custom_label' ];
154
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
155
+			$label = $this->item[ 'customLabel' ];
156 156
 		}
157 157
 
158 158
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
159 159
 
160 160
 		$label = esc_attr( $label );
161 161
 
162
-		if ( ! empty( $this->item['parent'] ) ) {
163
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
162
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
163
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
164 164
 		}
165 165
 
166 166
 		// Name of field / widget
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 
177 177
 		$output .= '</h5>';
178 178
 
179
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
179
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
180 180
 
181
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
181
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
182 182
 
183 183
 		return $output;
184 184
 	}
Please login to merge, or discard this patch.
includes/class-gravityview-uninstall.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@
 block discarded – undo
59 59
 
60 60
 		$notes_table = class_exists( 'GFFormsModel' ) ? GFFormsModel::get_lead_notes_table_name() : $wpdb->prefix . 'rg_lead_notes';
61 61
 
62
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
63
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
62
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
63
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
64 64
 
65 65
 		$sql = $wpdb->prepare( "
66 66
 			DELETE FROM $notes_table
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@  discard block
 block discarded – undo
20 20
 
21 21
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
22 22
 
23
-		unset( $field_options['search_filter'] );
23
+		unset( $field_options[ 'search_filter' ] );
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
29
-		$add_options['link_to_file'] = array(
29
+		$add_options[ 'link_to_file' ] = array(
30 30
 			'type' => 'checkbox',
31 31
 			'label' => __( 'Display as a Link:', 'gravityview' ),
32
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
32
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
33 33
 			'value' => false,
34 34
 			'merge_tags' => false,
35 35
 		);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		$output_arr = array();
66 66
 
67 67
 		// Get an array of file paths for the field.
68
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
68
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
69 69
 
70 70
 		// The $value JSON was probably truncated; let's check lead_detail_long.
71 71
 		if ( ! is_array( $file_paths ) ) {
@@ -79,19 +79,19 @@  discard block
 block discarded – undo
79 79
 		}
80 80
 
81 81
 		// Process each file path
82
-		foreach( $file_paths as $file_path ) {
82
+		foreach ( $file_paths as $file_path ) {
83 83
 
84 84
 			// If the site is HTTPS, use HTTPS
85
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme($file_path); }
85
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
86 86
 
87 87
 			// This is from Gravity Forms's code
88
-			$file_path = esc_attr(str_replace(" ", "%20", $file_path));
88
+			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
89 89
 
90 90
 			// If the field is set to link to the single entry, link to it.
91
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
91
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
92 92
 
93 93
 			// Get file path information
94
-			$file_path_info = pathinfo($file_path);
94
+			$file_path_info = pathinfo( $file_path );
95 95
 
96 96
 			$html_format = NULL;
97 97
 
@@ -100,30 +100,30 @@  discard block
 block discarded – undo
100 100
 			$disable_wrapped_link = false;
101 101
 
102 102
 			// Is this an image?
103
-			$image = new GravityView_Image(array(
103
+			$image = new GravityView_Image( array(
104 104
 				'src' => $file_path,
105
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
106
-				'alt' => $field_settings['label'],
107
-				'width' => (gravityview_get_context() === 'single' ? NULL : 250)
108
-			));
105
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
106
+				'alt' => $field_settings[ 'label' ],
107
+				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
108
+			) );
109 109
 
110 110
 			$content = $image->html();
111 111
 
112 112
 			// The new default content is the image, if it exists. If not, use the file name as the content.
113
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
113
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
114 114
 
115 115
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
116
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
116
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
117 117
 
118 118
 
119
-			switch( true ) {
119
+			switch ( true ) {
120 120
 
121 121
 				// Audio file
122 122
 				case in_array( $extension, wp_get_audio_extensions() ):
123 123
 
124 124
 					$disable_lightbox = true;
125 125
 
126
-					if( shortcode_exists( 'audio' ) ) {
126
+					if ( shortcode_exists( 'audio' ) ) {
127 127
 
128 128
 						$disable_wrapped_link = true;
129 129
 
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 						 */
135 135
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
136 136
 							'src' => $file_path,
137
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
138
-						));
137
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
138
+						) );
139 139
 
140 140
 						/**
141 141
 						 * Generate the audio shortcode
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 					$disable_lightbox = true;
155 155
 
156
-					if( shortcode_exists( 'video' ) ) {
156
+					if ( shortcode_exists( 'video' ) ) {
157 157
 
158 158
 						$disable_wrapped_link = true;
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 						 */
165 165
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
166 166
 							'src' => $file_path,
167
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
168
-						));
167
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
168
+						) );
169 169
 
170 170
 						/**
171 171
 						 * Generate the video shortcode
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 					break;
188 188
 
189 189
 				// if not image, do not set the lightbox (@since 1.5.3)
190
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
190
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
191 191
 
192 192
 					$disable_lightbox = true;
193 193
 
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
 
198 198
 			// If using Link to File, override the content.
199 199
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
200
-			if( !empty( $field_settings['link_to_file'] ) ) {
200
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
201 201
 
202 202
 				// Force the content to be the file name
203
-				$content =  $file_path_info["basename"];
203
+				$content = $file_path_info[ "basename" ];
204 204
 
205 205
 				// Restore the wrapped link
206 206
 				$disable_wrapped_link = false;
@@ -208,13 +208,13 @@  discard block
 block discarded – undo
208 208
 			}
209 209
 
210 210
 			// Whether to use lightbox or not
211
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
211
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
212 212
 
213
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
213
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
214 214
 
215 215
 			} else {
216 216
 
217
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
217
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
218 218
 
219 219
 				$link_atts = array(
220 220
 					'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
241 241
 
242 242
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
243
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
243
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
244 244
 
245 245
 				/**
246 246
 				 * Modify the link text (defaults to the file name)
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                 $content = gravityview_get_link( $link, $content, $link_atts );
256 256
 			}
257 257
 
258
-			$output_arr[] = array(
258
+			$output_arr[ ] = array(
259 259
 				'file_path' => $file_path,
260 260
 				'content' => $content
261 261
 			);
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
65 65
 
66
-		if( false === $approved_result || false === $disapproved_result ) {
66
+		if ( false === $approved_result || false === $disapproved_result ) {
67 67
 			do_action( 'gravityview_log_error', __METHOD__ . ': There was an error processing the query.', $wpdb->last_error );
68 68
 		} else {
69 69
 			// All done: Meta values are migrated
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
 		$redux_settings = $this->get_redux_settings();
97 97
 
98 98
 		// No need to process
99
-		if( false === $redux_settings ) {
99
+		if ( false === $redux_settings ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		if( empty(  $redux_settings['license_key_status'] ) ) {
103
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
104 104
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
105 105
 		}
106 106
 
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
115 115
 
116 116
 		// And now remove the previous option, so this is a one-time thing.
117
-		delete_option('gravityview_settings');
118
-		delete_option('gravityview_settings-transients');
117
+		delete_option( 'gravityview_settings' );
118
+		delete_option( 'gravityview_settings-transients' );
119 119
 	}
120 120
 
121 121
 	/**
@@ -131,16 +131,16 @@  discard block
 block discarded – undo
131 131
 
132 132
 		$data = array(
133 133
 			'edd_action' => 'check_license',
134
-			'license' => rgget('license_key', $redux_settings ),
134
+			'license' => rgget( 'license_key', $redux_settings ),
135 135
 			'update' => false,
136 136
 			'format' => 'object',
137 137
 		);
138 138
 
139 139
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
140 140
 
141
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
142
-			$redux_settings['license_key_status'] = $license_call->license;
143
-			$redux_settings['license_key_response'] = json_encode( $license_call );
141
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
142
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
143
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
144 144
 		}
145 145
 
146 146
 		return $redux_settings;
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
 	function get_redux_settings() {
155 155
 
156 156
 		// Previous settings set by Redux
157
-		$redux_option = get_option('gravityview_settings');
157
+		$redux_option = get_option( 'gravityview_settings' );
158 158
 
159 159
 		// No Redux settings? Don't proceed.
160
-		if( false === $redux_option ) {
160
+		if ( false === $redux_option ) {
161 161
 			return false;
162 162
 		}
163 163
 
@@ -167,21 +167,21 @@  discard block
 block discarded – undo
167 167
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
168 168
 		);
169 169
 
170
-		if( $license_array = rgget( 'license', $redux_option ) ) {
170
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
171 171
 
172
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
172
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
173 173
 
174
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
174
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
175 175
 
176 176
 			// This contains the last response for license validation
177
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
177
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
178 178
 
179
-				$saved_license = rgget('license', $saved_values );
179
+				$saved_license = rgget( 'license', $saved_values );
180 180
 
181 181
 				// Only use the last-saved values if they are for the same license
182
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
183
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
184
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
182
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
183
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
184
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
185 185
 				}
186 186
 			}
187 187
 		}
@@ -193,8 +193,8 @@  discard block
 block discarded – undo
193 193
 	/** ----  Migrate from old search widget to new search widget  ---- */
194 194
 	function update_search_on_views() {
195 195
 
196
-		if( !class_exists('GravityView_Widget_Search') ) {
197
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
196
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
197
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
198 198
 		}
199 199
 
200 200
 		// Loop through all the views
@@ -206,20 +206,20 @@  discard block
 block discarded – undo
206 206
 
207 207
 		$views = get_posts( $query_args );
208 208
 
209
-		foreach( $views as $view ) {
209
+		foreach ( $views as $view ) {
210 210
 
211 211
 			$widgets = gravityview_get_directory_widgets( $view->ID );
212 212
 			$search_fields = null;
213 213
 
214
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
214
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
215 215
 
216 216
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
217 217
 
218
-			foreach( $widgets as $area => $ws ) {
219
-				foreach( $ws as $k => $widget ) {
220
-					if( $widget['id'] !== 'search_bar' ) { continue; }
218
+			foreach ( $widgets as $area => $ws ) {
219
+				foreach ( $ws as $k => $widget ) {
220
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
221 221
 
222
-					if( is_null( $search_fields ) ) {
222
+					if ( is_null( $search_fields ) ) {
223 223
 						$search_fields = $this->get_search_fields( $view->ID );
224 224
 					}
225 225
 
@@ -227,24 +227,24 @@  discard block
 block discarded – undo
227 227
 					//  [search_free] => 1
228 228
 			        //  [search_date] => 1
229 229
 			        $search_generic = array();
230
-					if( !empty( $widget['search_free'] ) ) {
231
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
230
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
231
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
232 232
 					}
233
-					if( !empty( $widget['search_date'] ) ) {
234
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
233
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
234
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
235 235
 					}
236 236
 
237 237
 					$search_config = array_merge( $search_generic, $search_fields );
238 238
 
239 239
 					// don't throw '[]' when json_encode an empty array
240
-					if( empty( $search_config ) ) {
240
+					if ( empty( $search_config ) ) {
241 241
 						$search_config = '';
242 242
 					} else {
243 243
 						$search_config = json_encode( $search_config );
244 244
 					}
245 245
 
246
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
247
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
246
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
247
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
248 248
 
249 249
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
250 250
 				}
@@ -272,26 +272,26 @@  discard block
 block discarded – undo
272 272
 		// check view fields' settings
273 273
 		$fields = gravityview_get_directory_fields( $view_id, false );
274 274
 
275
-		if( !empty( $fields ) && is_array( $fields ) ) {
275
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
276 276
 
277
-			foreach( $fields as $t => $fs ) {
277
+			foreach ( $fields as $t => $fs ) {
278 278
 
279
-				foreach( $fs as $k => $field ) {
279
+				foreach ( $fs as $k => $field ) {
280 280
 					// is field a search_filter ?
281
-					if( empty( $field['search_filter'] ) ) { continue; }
281
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
282 282
 
283 283
 					// get field type & calculate the input type (by default)
284
-					$form_field = gravityview_get_field( $form, $field['id'] );
284
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
285 285
 
286
-					if( empty( $form_field['type'] ) ) {
286
+					if ( empty( $form_field[ 'type' ] ) ) {
287 287
 						continue;
288 288
 					}
289 289
 
290 290
 					// depending on the field type assign a group of possible search field types
291
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
291
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
292 292
 
293 293
 					// add field to config
294
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
294
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
295 295
 
296 296
 				}
297 297
 			}
Please login to merge, or discard this patch.