@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $signature_fields = GFAPI::get_fields_by_type( $form, 'signature' ); |
54 | 54 | |
55 | 55 | foreach ( $signature_fields as $field ) { |
56 | - unset( $_POST["input_{$field->id}"] ); |
|
56 | + unset( $_POST[ "input_{$field->id}" ] ); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
@@ -72,19 +72,19 @@ discard block |
||
72 | 72 | */ |
73 | 73 | function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) { |
74 | 74 | |
75 | - $context = function_exists('gravityview_get_context') ? gravityview_get_context() : ''; |
|
75 | + $context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : ''; |
|
76 | 76 | |
77 | - if( 'signature' !== $field->type || 'edit' !== $context ) { |
|
77 | + if ( 'signature' !== $field->type || 'edit' !== $context ) { |
|
78 | 78 | return $field_content; |
79 | 79 | } |
80 | 80 | |
81 | 81 | // We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet. |
82 | 82 | $entry = GravityView_View::getInstance()->getCurrentEntry(); |
83 | - $entry = GFAPI::get_entry( $entry['id'] ); |
|
83 | + $entry = GFAPI::get_entry( $entry[ 'id' ] ); |
|
84 | 84 | $entry_value = \GV\Utils::get( $entry, $field->id ); |
85 | 85 | |
86 | - $_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted |
|
87 | - $_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
86 | + $_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted |
|
87 | + $_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
88 | 88 | |
89 | 89 | return ''; // Return empty string to force using $_POST values instead |
90 | 90 | } |
@@ -48,132 +48,132 @@ |
||
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | - * Given information provided in an entry, get array of media IDs |
|
52 | - * |
|
53 | - * This is necessary because GF doesn't expect to need to update post images, only to create them. |
|
54 | - * |
|
55 | - * @see GFFormsModel::create_post() |
|
56 | - * |
|
57 | - * @since 1.17 |
|
58 | - * |
|
59 | - * @param array $form Gravity Forms form array |
|
60 | - * @param array $entry Gravity Forms entry array |
|
61 | - * |
|
62 | - * @return array Array of "Field ID" => "Media IDs" |
|
63 | - */ |
|
64 | - public static function get_post_field_images( $form, $entry ) { |
|
65 | - |
|
66 | - $post_data = self::get_post_fields( $form, $entry ); |
|
67 | - |
|
68 | - $media = get_attached_media( 'image', $entry['post_id'] ); |
|
69 | - |
|
70 | - $post_images = array(); |
|
71 | - |
|
72 | - foreach ( $media as $media_item ) { |
|
73 | - foreach( (array) $post_data['images'] as $post_data_item ) { |
|
74 | - if( |
|
75 | - \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
|
76 | - \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
|
77 | - \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
|
78 | - ) { |
|
79 | - $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
80 | - } |
|
81 | - } |
|
82 | - } |
|
83 | - |
|
84 | - return $post_images; |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * Alias of GFFormsModel::get_post_fields(); just making it public |
|
89 | - * |
|
90 | - * @see GFFormsModel::get_post_fields() |
|
91 | - * |
|
92 | - * @since 1.17 |
|
93 | - * |
|
94 | - * @param array $form Gravity Forms form array |
|
95 | - * @param array $entry Gravity Forms entry array |
|
96 | - * |
|
97 | - * @return array |
|
98 | - */ |
|
99 | - public static function get_post_fields( $form, $entry ) { |
|
100 | - |
|
101 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' ); |
|
102 | - |
|
103 | - /** |
|
104 | - * If the method changes to public, use Gravity Forms' method |
|
105 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
106 | - */ |
|
107 | - if( $reflection->isPublic() ) { |
|
108 | - return parent::get_post_fields( $form, $entry ); |
|
109 | - } |
|
110 | - |
|
111 | - // It was private; let's make it public |
|
112 | - $reflection->setAccessible( true ); |
|
113 | - |
|
114 | - return $reflection->invoke( new GFFormsModel, $form, $entry ); |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private. |
|
119 | - * |
|
120 | - * @since 1.16.2 |
|
121 | - * |
|
122 | - * @param string $url URL of the post image to update |
|
123 | - * @param int $post_id ID of the post image to update |
|
124 | - * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path. |
|
125 | - */ |
|
126 | - public static function copy_post_image( $url, $post_id ) { |
|
127 | - |
|
128 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' ); |
|
129 | - |
|
130 | - /** |
|
131 | - * If the method changes to public, use Gravity Forms' method |
|
132 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
133 | - */ |
|
134 | - if( $reflection->isPublic() ) { |
|
135 | - return parent::copy_post_image( $url, $post_id ); |
|
136 | - } |
|
137 | - |
|
138 | - // It was private; let's make it public |
|
139 | - $reflection->setAccessible( true ); |
|
140 | - |
|
141 | - return $reflection->invoke( new GFFormsModel, $url, $post_id ); |
|
142 | - } |
|
143 | - |
|
144 | - /** |
|
145 | - * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private. |
|
146 | - * |
|
147 | - * Note: The method became public in GF 1.9.17.7 |
|
148 | - * |
|
149 | - * @see GFFormsModel::media_handle_upload |
|
150 | - * @see GravityView_Edit_Entry_Render::maybe_update_post_fields |
|
151 | - * |
|
152 | - * @uses copy_post_image |
|
153 | - * @uses wp_insert_attachment |
|
154 | - * @uses wp_update_attachment_metadata |
|
155 | - * |
|
156 | - * @param string $url URL of the post image to update |
|
157 | - * @param int $post_id ID of the post image to update |
|
158 | - * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys. |
|
159 | - * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image |
|
160 | - */ |
|
161 | - public static function media_handle_upload( $url, $post_id, $post_data = array() ) { |
|
162 | - |
|
163 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' ); |
|
164 | - |
|
165 | - /** |
|
166 | - * If the method changes to public, use Gravity Forms' method |
|
167 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
168 | - */ |
|
169 | - if( $reflection->isPublic() ) { |
|
170 | - return parent::media_handle_upload( $url, $post_id, $post_data ); |
|
171 | - } |
|
172 | - |
|
173 | - // It was private; let's make it public |
|
174 | - $reflection->setAccessible( true ); |
|
175 | - |
|
176 | - return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data ); |
|
177 | - } |
|
51 | + * Given information provided in an entry, get array of media IDs |
|
52 | + * |
|
53 | + * This is necessary because GF doesn't expect to need to update post images, only to create them. |
|
54 | + * |
|
55 | + * @see GFFormsModel::create_post() |
|
56 | + * |
|
57 | + * @since 1.17 |
|
58 | + * |
|
59 | + * @param array $form Gravity Forms form array |
|
60 | + * @param array $entry Gravity Forms entry array |
|
61 | + * |
|
62 | + * @return array Array of "Field ID" => "Media IDs" |
|
63 | + */ |
|
64 | + public static function get_post_field_images( $form, $entry ) { |
|
65 | + |
|
66 | + $post_data = self::get_post_fields( $form, $entry ); |
|
67 | + |
|
68 | + $media = get_attached_media( 'image', $entry['post_id'] ); |
|
69 | + |
|
70 | + $post_images = array(); |
|
71 | + |
|
72 | + foreach ( $media as $media_item ) { |
|
73 | + foreach( (array) $post_data['images'] as $post_data_item ) { |
|
74 | + if( |
|
75 | + \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
|
76 | + \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
|
77 | + \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
|
78 | + ) { |
|
79 | + $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
80 | + } |
|
81 | + } |
|
82 | + } |
|
83 | + |
|
84 | + return $post_images; |
|
85 | + } |
|
86 | + |
|
87 | + /** |
|
88 | + * Alias of GFFormsModel::get_post_fields(); just making it public |
|
89 | + * |
|
90 | + * @see GFFormsModel::get_post_fields() |
|
91 | + * |
|
92 | + * @since 1.17 |
|
93 | + * |
|
94 | + * @param array $form Gravity Forms form array |
|
95 | + * @param array $entry Gravity Forms entry array |
|
96 | + * |
|
97 | + * @return array |
|
98 | + */ |
|
99 | + public static function get_post_fields( $form, $entry ) { |
|
100 | + |
|
101 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' ); |
|
102 | + |
|
103 | + /** |
|
104 | + * If the method changes to public, use Gravity Forms' method |
|
105 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
106 | + */ |
|
107 | + if( $reflection->isPublic() ) { |
|
108 | + return parent::get_post_fields( $form, $entry ); |
|
109 | + } |
|
110 | + |
|
111 | + // It was private; let's make it public |
|
112 | + $reflection->setAccessible( true ); |
|
113 | + |
|
114 | + return $reflection->invoke( new GFFormsModel, $form, $entry ); |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private. |
|
119 | + * |
|
120 | + * @since 1.16.2 |
|
121 | + * |
|
122 | + * @param string $url URL of the post image to update |
|
123 | + * @param int $post_id ID of the post image to update |
|
124 | + * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path. |
|
125 | + */ |
|
126 | + public static function copy_post_image( $url, $post_id ) { |
|
127 | + |
|
128 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' ); |
|
129 | + |
|
130 | + /** |
|
131 | + * If the method changes to public, use Gravity Forms' method |
|
132 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
133 | + */ |
|
134 | + if( $reflection->isPublic() ) { |
|
135 | + return parent::copy_post_image( $url, $post_id ); |
|
136 | + } |
|
137 | + |
|
138 | + // It was private; let's make it public |
|
139 | + $reflection->setAccessible( true ); |
|
140 | + |
|
141 | + return $reflection->invoke( new GFFormsModel, $url, $post_id ); |
|
142 | + } |
|
143 | + |
|
144 | + /** |
|
145 | + * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private. |
|
146 | + * |
|
147 | + * Note: The method became public in GF 1.9.17.7 |
|
148 | + * |
|
149 | + * @see GFFormsModel::media_handle_upload |
|
150 | + * @see GravityView_Edit_Entry_Render::maybe_update_post_fields |
|
151 | + * |
|
152 | + * @uses copy_post_image |
|
153 | + * @uses wp_insert_attachment |
|
154 | + * @uses wp_update_attachment_metadata |
|
155 | + * |
|
156 | + * @param string $url URL of the post image to update |
|
157 | + * @param int $post_id ID of the post image to update |
|
158 | + * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys. |
|
159 | + * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image |
|
160 | + */ |
|
161 | + public static function media_handle_upload( $url, $post_id, $post_data = array() ) { |
|
162 | + |
|
163 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' ); |
|
164 | + |
|
165 | + /** |
|
166 | + * If the method changes to public, use Gravity Forms' method |
|
167 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
168 | + */ |
|
169 | + if( $reflection->isPublic() ) { |
|
170 | + return parent::media_handle_upload( $url, $post_id, $post_data ); |
|
171 | + } |
|
172 | + |
|
173 | + // It was private; let's make it public |
|
174 | + $reflection->setAccessible( true ); |
|
175 | + |
|
176 | + return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data ); |
|
177 | + } |
|
178 | 178 | |
179 | 179 | } |
180 | 180 | \ No newline at end of file |
@@ -40,17 +40,17 @@ discard block |
||
40 | 40 | public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) { |
41 | 41 | |
42 | 42 | if ( in_array( $source_field, array( 'date_created', 'date_updated', 'payment_date' ), true ) ) { |
43 | - $field_value = is_int( $field_value )? $field_value : strtotime( $field_value ); |
|
44 | - $target_value = is_int( $target_value )? $target_value : strtotime( $target_value ); |
|
43 | + $field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value ); |
|
44 | + $target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | if ( $source_field instanceof GF_Field && $source_field->type == 'date' ) { |
48 | - $field_value = is_int( $field_value )? $field_value : strtotime( $field_value ); |
|
49 | - $target_value = is_int( $target_value )? $target_value : strtotime( $target_value ); |
|
48 | + $field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value ); |
|
49 | + $target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), array( 'in', 'not_in' ) ) ) { |
53 | - return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $_operation ); |
|
53 | + return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $_operation ); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); |
@@ -74,18 +74,18 @@ discard block |
||
74 | 74 | |
75 | 75 | $post_data = self::get_post_fields( $form, $entry ); |
76 | 76 | |
77 | - $media = get_attached_media( 'image', $entry['post_id'] ); |
|
77 | + $media = get_attached_media( 'image', $entry[ 'post_id' ] ); |
|
78 | 78 | |
79 | 79 | $post_images = array(); |
80 | 80 | |
81 | 81 | foreach ( $media as $media_item ) { |
82 | - foreach( (array) $post_data['images'] as $post_data_item ) { |
|
83 | - if( |
|
82 | + foreach ( (array)$post_data[ 'images' ] as $post_data_item ) { |
|
83 | + if ( |
|
84 | 84 | \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
85 | 85 | \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
86 | 86 | \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
87 | 87 | ) { |
88 | - $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
88 | + $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID; |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * If the method changes to public, use Gravity Forms' method |
114 | 114 | * @todo: If/when the method is public, remove the unneeded copied code. |
115 | 115 | */ |
116 | - if( $reflection->isPublic() ) { |
|
116 | + if ( $reflection->isPublic() ) { |
|
117 | 117 | return parent::get_post_fields( $form, $entry ); |
118 | 118 | } |
119 | 119 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * If the method changes to public, use Gravity Forms' method |
141 | 141 | * @todo: If/when the method is public, remove the unneeded copied code. |
142 | 142 | */ |
143 | - if( $reflection->isPublic() ) { |
|
143 | + if ( $reflection->isPublic() ) { |
|
144 | 144 | return parent::copy_post_image( $url, $post_id ); |
145 | 145 | } |
146 | 146 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * If the method changes to public, use Gravity Forms' method |
176 | 176 | * @todo: If/when the method is public, remove the unneeded copied code. |
177 | 177 | */ |
178 | - if( $reflection->isPublic() ) { |
|
178 | + if ( $reflection->isPublic() ) { |
|
179 | 179 | return parent::media_handle_upload( $url, $post_id, $post_data ); |
180 | 180 | } |
181 | 181 |
@@ -20,7 +20,7 @@ discard block |
||
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 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | foreach ( $passed_post as &$post ) { |
76 | 76 | $views = \GV\View_Collection::from_post( $post ); |
77 | 77 | foreach ( $views->all() as $view ) { |
78 | - $ids []= $view->ID; |
|
78 | + $ids [ ] = $view->ID; |
|
79 | 79 | |
80 | 80 | /** And as a side-effect... add each view to the global scope. */ |
81 | 81 | if ( ! $this->views->contains( $view->ID ) ) { |
@@ -89,29 +89,29 @@ discard block |
||
89 | 89 | if ( is_string( $passed_post ) ) { |
90 | 90 | $shortcodes = \GV\Shortcode::parse( $passed_post ); |
91 | 91 | foreach ( $shortcodes as $shortcode ) { |
92 | - if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) { |
|
93 | - $ids []= $shortcode->atts['id']; |
|
92 | + if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) { |
|
93 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
94 | 94 | |
95 | 95 | /** And as a side-effect... add each view to the global scope. */ |
96 | - if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) { |
|
97 | - $this->views->add( $shortcode->atts['id'] ); |
|
96 | + if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) { |
|
97 | + $this->views->add( $shortcode->atts[ 'id' ] ); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | } |
101 | 101 | } else { |
102 | 102 | $id = $this->get_id_from_atts( $passed_post ); |
103 | - $ids[] = intval( $id ); |
|
103 | + $ids[ ] = intval( $id ); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if( empty($ids) ) { |
|
108 | + if ( empty( $ids ) ) { |
|
109 | 109 | return NULL; |
110 | 110 | } |
111 | 111 | |
112 | 112 | // If it's just one ID, return that. |
113 | 113 | // Otherwise, return array of IDs |
114 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
114 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public static function getInstance( $passed_post = NULL ) { |
121 | 121 | |
122 | - if( empty( self::$instance ) ) { |
|
122 | + if ( empty( self::$instance ) ) { |
|
123 | 123 | self::$instance = new GravityView_View_Data( $passed_post ); |
124 | 124 | } |
125 | 125 | |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | return array(); |
136 | 136 | } |
137 | 137 | return array_combine( |
138 | - array_map( function ( $view ) { return $view->ID; }, $this->views->all() ), |
|
139 | - array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
138 | + array_map( function( $view ) { return $view->ID; }, $this->views->all() ), |
|
139 | + array_map( function( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
140 | 140 | ); |
141 | 141 | } |
142 | 142 | |
@@ -245,22 +245,22 @@ discard block |
||
245 | 245 | public function parse_post_content( $content ) { |
246 | 246 | $ids = array(); |
247 | 247 | foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) { |
248 | - if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) { |
|
249 | - if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) { |
|
250 | - $this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) ); |
|
248 | + if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
249 | + if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) { |
|
250 | + $this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
251 | 251 | } |
252 | 252 | /** |
253 | 253 | * The original function outputs the ID even though it wasn't added by ::add_view() |
254 | 254 | * Wether this is a bug or not remains a mystery. But we need to emulate this behavior |
255 | 255 | * until better times. |
256 | 256 | */ |
257 | - $ids []= $shortcode->atts['id']; |
|
257 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
258 | 258 | } |
259 | 259 | } |
260 | 260 | if ( empty ( $ids ) ) { |
261 | 261 | return null; |
262 | 262 | } |
263 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
263 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | /** |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | // Not invalid if not set! |
284 | 284 | if ( empty( $post_id ) || empty( $view_id ) ) { |
285 | 285 | |
286 | - if( $empty_is_valid ) { |
|
286 | + if ( $empty_is_valid ) { |
|
287 | 287 | return true; |
288 | 288 | } |
289 | 289 | |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() ); |
317 | 317 | |
318 | 318 | // The post or page specified does not contain the shortcode. |
319 | - if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) { |
|
319 | + if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) { |
|
320 | 320 | $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>' ); |
321 | 321 | } |
322 | 322 | } |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | if ( ! $message ) { |
325 | 325 | // It's a View |
326 | 326 | if ( \GV\View::exists( $post_id ) ) { |
327 | - $message = esc_html__( 'The ID is already a View.', 'gravityview' );; |
|
327 | + $message = esc_html__( 'The ID is already a View.', 'gravityview' ); ; |
|
328 | 328 | } |
329 | 329 | } |
330 | 330 |
@@ -60,21 +60,21 @@ discard block |
||
60 | 60 | public function dismiss_notice() { |
61 | 61 | |
62 | 62 | // No dismiss sent |
63 | - if( empty( $_GET['gv-dismiss'] ) ) { |
|
63 | + if ( empty( $_GET[ 'gv-dismiss' ] ) ) { |
|
64 | 64 | return; |
65 | 65 | } |
66 | 66 | |
67 | 67 | // Invalid nonce |
68 | - if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) { |
|
68 | + if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) { |
|
69 | 69 | return; |
70 | 70 | } |
71 | 71 | |
72 | - $notice_id = esc_attr( $_GET['notice'] ); |
|
72 | + $notice_id = esc_attr( $_GET[ 'notice' ] ); |
|
73 | 73 | |
74 | 74 | //don't display a message if use has dismissed the message for this version |
75 | 75 | $dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' ); |
76 | 76 | |
77 | - $dismissed_notices[] = $notice_id; |
|
77 | + $dismissed_notices[ ] = $notice_id; |
|
78 | 78 | |
79 | 79 | $dismissed_notices = array_unique( $dismissed_notices ); |
80 | 80 | |
@@ -97,12 +97,12 @@ discard block |
||
97 | 97 | private function is_notice_dismissed( $notice ) { |
98 | 98 | |
99 | 99 | // There are no dismissed notices. |
100 | - if( empty( self::$dismissed_notices ) ) { |
|
100 | + if ( empty( self::$dismissed_notices ) ) { |
|
101 | 101 | return false; |
102 | 102 | } |
103 | 103 | |
104 | 104 | // Has the |
105 | - $is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices ); |
|
105 | + $is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices ); |
|
106 | 106 | |
107 | 107 | return $is_dismissed ? true : false; |
108 | 108 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | private function check_show_multisite_notices() { |
129 | 129 | |
130 | - if( ! is_multisite() ) { |
|
130 | + if ( ! is_multisite() ) { |
|
131 | 131 | return true; |
132 | 132 | } |
133 | 133 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | // or they don't have admin capabilities |
140 | - if( ! is_super_admin() ) { |
|
140 | + if ( ! is_super_admin() ) { |
|
141 | 141 | return false; |
142 | 142 | } |
143 | 143 | |
@@ -160,48 +160,48 @@ discard block |
||
160 | 160 | */ |
161 | 161 | $notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices ); |
162 | 162 | |
163 | - if( empty( $notices ) || ! $this->check_show_multisite_notices() ) { |
|
163 | + if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) { |
|
164 | 164 | return; |
165 | 165 | } |
166 | 166 | |
167 | 167 | //don't display a message if use has dismissed the message for this version |
168 | 168 | // TODO: Use get_user_meta instead of get_transient |
169 | - self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' ); |
|
169 | + self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' ); |
|
170 | 170 | |
171 | 171 | $output = ''; |
172 | 172 | |
173 | - foreach( $notices as $notice ) { |
|
173 | + foreach ( $notices as $notice ) { |
|
174 | 174 | |
175 | 175 | // If the user doesn't have the capability to see the warning |
176 | - if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) { |
|
176 | + if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) { |
|
177 | 177 | gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) ); |
178 | 178 | continue; |
179 | 179 | } |
180 | 180 | |
181 | - if( true === $this->is_notice_dismissed( $notice ) ) { |
|
181 | + if ( true === $this->is_notice_dismissed( $notice ) ) { |
|
182 | 182 | gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) ); |
183 | 183 | continue; |
184 | 184 | } |
185 | 185 | |
186 | - $output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">'; |
|
186 | + $output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">'; |
|
187 | 187 | |
188 | 188 | // Too cute to leave out. |
189 | 189 | $output .= gravityview_get_floaty(); |
190 | 190 | |
191 | - if( !empty( $notice['title'] ) ) { |
|
192 | - $output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>'; |
|
191 | + if ( ! empty( $notice[ 'title' ] ) ) { |
|
192 | + $output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>'; |
|
193 | 193 | } |
194 | 194 | |
195 | - $message = isset( $notice['message'] ) ? $notice['message'] : ''; |
|
195 | + $message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : ''; |
|
196 | 196 | |
197 | - if( !empty( $notice['dismiss'] ) ) { |
|
197 | + if ( ! empty( $notice[ 'dismiss' ] ) ) { |
|
198 | 198 | |
199 | - $dismiss = esc_attr($notice['dismiss']); |
|
199 | + $dismiss = esc_attr( $notice[ 'dismiss' ] ); |
|
200 | 200 | |
201 | 201 | $url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) ); |
202 | 202 | |
203 | 203 | $align = is_rtl() ? 'alignleft' : 'alignright'; |
204 | - $message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>'; |
|
204 | + $message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>'; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | $output .= wpautop( $message ); |
@@ -233,14 +233,14 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public static function add_notice( $notice = array() ) { |
235 | 235 | |
236 | - if( !isset( $notice['message'] ) ) { |
|
236 | + if ( ! isset( $notice[ 'message' ] ) ) { |
|
237 | 237 | gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) ); |
238 | 238 | return; |
239 | 239 | } |
240 | 240 | |
241 | - $notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class']; |
|
241 | + $notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ]; |
|
242 | 242 | |
243 | - self::$admin_notices[] = $notice; |
|
243 | + self::$admin_notices[ ] = $notice; |
|
244 | 244 | } |
245 | 245 | } |
246 | 246 |
@@ -113,16 +113,16 @@ discard block |
||
113 | 113 | $new_value = $old_value; |
114 | 114 | |
115 | 115 | // Meta value does not exist yet |
116 | - if( false === $old_value ) { |
|
116 | + if ( false === $old_value ) { |
|
117 | 117 | return self::UNAPPROVED; |
118 | 118 | } |
119 | 119 | |
120 | 120 | // Meta value does not exist yet |
121 | - if( true === $old_value ) { |
|
121 | + if ( true === $old_value ) { |
|
122 | 122 | return self::APPROVED; |
123 | 123 | } |
124 | 124 | |
125 | - switch ( (string) $old_value ) { |
|
125 | + switch ( (string)$old_value ) { |
|
126 | 126 | |
127 | 127 | // Approved values |
128 | 128 | case 'Approved': |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | foreach ( $choices as $key => $choice ) { |
249 | 249 | |
250 | 250 | // Is the passed status value the same as the choice value or key? |
251 | - if ( $status === $choice['value'] || $status === $key ) { |
|
251 | + if ( $status === $choice[ 'value' ] || $status === $key ) { |
|
252 | 252 | |
253 | - if( 'key' === $attr_key ) { |
|
253 | + if ( 'key' === $attr_key ) { |
|
254 | 254 | return $key; |
255 | 255 | } else { |
256 | 256 | return \GV\Utils::get( $choice, $attr_key, false ); |
@@ -11,35 +11,35 @@ discard block |
||
11 | 11 | |
12 | 12 | function __construct() { |
13 | 13 | |
14 | - $this->widget_description = __('Links to multiple pages of results.', 'gravityview' ); |
|
14 | + $this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' ); |
|
15 | 15 | |
16 | 16 | $default_values = array( 'header' => 1, 'footer' => 1 ); |
17 | 17 | $settings = array( 'show_all' => array( |
18 | 18 | 'type' => 'checkbox', |
19 | 19 | 'label' => __( 'Show each page number', 'gravityview' ), |
20 | - 'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'), |
|
20 | + 'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ), |
|
21 | 21 | 'value' => false |
22 | - )); |
|
23 | - parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings ); |
|
22 | + ) ); |
|
23 | + parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings ); |
|
24 | 24 | |
25 | 25 | } |
26 | 26 | |
27 | - public function render_frontend( $widget_args, $content = '', $context = '') { |
|
27 | + public function render_frontend( $widget_args, $content = '', $context = '' ) { |
|
28 | 28 | $gravityview_view = GravityView_View::getInstance(); |
29 | 29 | |
30 | - if( !$this->pre_render_frontend() ) { |
|
30 | + if ( ! $this->pre_render_frontend() ) { |
|
31 | 31 | return; |
32 | 32 | } |
33 | 33 | |
34 | 34 | $atts = shortcode_atts( array( |
35 | 35 | 'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ), |
36 | 36 | 'total' => $gravityview_view->total_entries, |
37 | - 'show_all' => !empty( $this->settings['show_all']['default'] ), |
|
38 | - 'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ), |
|
37 | + 'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ), |
|
38 | + 'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ), |
|
39 | 39 | ), $widget_args, 'gravityview_widget_page_links' ); |
40 | 40 | |
41 | 41 | $page_link_args = array( |
42 | - 'base' => add_query_arg('pagenum','%#%', gv_directory_link() ), |
|
42 | + 'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ), |
|
43 | 43 | 'format' => '&pagenum=%#%', |
44 | 44 | 'add_args' => array(), // |
45 | 45 | 'prev_text' => '«', |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | 'type' => 'list', |
48 | 48 | 'end_size' => 1, |
49 | 49 | 'mid_size' => 2, |
50 | - 'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ), |
|
51 | - 'current' => $atts['current'], |
|
52 | - 'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice |
|
50 | + 'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ), |
|
51 | + 'current' => $atts[ 'current' ], |
|
52 | + 'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice |
|
53 | 53 | ); |
54 | 54 | |
55 | 55 | /** |
@@ -57,14 +57,14 @@ discard block |
||
57 | 57 | * @since 1.1.4 |
58 | 58 | * @param array $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/) |
59 | 59 | */ |
60 | - $page_link_args = apply_filters('gravityview_page_links_args', $page_link_args ); |
|
60 | + $page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args ); |
|
61 | 61 | |
62 | 62 | $page_links = paginate_links( $page_link_args ); |
63 | 63 | |
64 | - if( !empty( $page_links )) { |
|
65 | - $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
64 | + if ( ! empty( $page_links ) ) { |
|
65 | + $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
66 | 66 | $class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class ); |
67 | - echo '<div class="'.$class.'">'. $page_links .'</div>'; |
|
67 | + echo '<div class="' . $class . '">' . $page_links . '</div>'; |
|
68 | 68 | } else { |
69 | 69 | gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' ); |
70 | 70 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | |
18 | 18 | function __construct() { |
19 | 19 | |
20 | - $this->widget_description = __('Insert custom text or HTML as a widget', 'gravityview' ); |
|
20 | + $this->widget_description = __( 'Insert custom text or HTML as a widget', 'gravityview' ); |
|
21 | 21 | |
22 | 22 | $default_values = array( |
23 | 23 | 'header' => 1, |
@@ -42,39 +42,39 @@ discard block |
||
42 | 42 | ), |
43 | 43 | ); |
44 | 44 | |
45 | - parent::__construct( __( 'Custom Content', 'gravityview' ) , 'custom_content', $default_values, $settings ); |
|
45 | + parent::__construct( __( 'Custom Content', 'gravityview' ), 'custom_content', $default_values, $settings ); |
|
46 | 46 | } |
47 | 47 | |
48 | - public function render_frontend( $widget_args, $content = '', $context = '') { |
|
48 | + public function render_frontend( $widget_args, $content = '', $context = '' ) { |
|
49 | 49 | |
50 | - if( !$this->pre_render_frontend() ) { |
|
50 | + if ( ! $this->pre_render_frontend() ) { |
|
51 | 51 | return; |
52 | 52 | } |
53 | 53 | |
54 | - if( !empty( $widget_args['title'] ) ) { |
|
55 | - echo $widget_args['title']; |
|
54 | + if ( ! empty( $widget_args[ 'title' ] ) ) { |
|
55 | + echo $widget_args[ 'title' ]; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | |
59 | 59 | // Make sure the class is loaded in DataTables |
60 | - if( !class_exists( 'GFFormDisplay' ) ) { |
|
60 | + if ( ! class_exists( 'GFFormDisplay' ) ) { |
|
61 | 61 | include_once( GFCommon::get_base_path() . '/form_display.php' ); |
62 | 62 | } |
63 | 63 | |
64 | - $widget_args['content'] = trim( rtrim( $widget_args['content'] ) ); |
|
64 | + $widget_args[ 'content' ] = trim( rtrim( $widget_args[ 'content' ] ) ); |
|
65 | 65 | |
66 | 66 | // No custom content |
67 | - if( empty( $widget_args['content'] ) ) { |
|
67 | + if ( empty( $widget_args[ 'content' ] ) ) { |
|
68 | 68 | gravityview()->log->debug( 'No content.' ); |
69 | 69 | return; |
70 | 70 | } |
71 | 71 | |
72 | 72 | // Add paragraphs? |
73 | - if( !empty( $widget_args['wpautop'] ) ) { |
|
74 | - $widget_args['content'] = wpautop( $widget_args['content'] ); |
|
73 | + if ( ! empty( $widget_args[ 'wpautop' ] ) ) { |
|
74 | + $widget_args[ 'content' ] = wpautop( $widget_args[ 'content' ] ); |
|
75 | 75 | } |
76 | 76 | |
77 | - $content = $widget_args['content']; |
|
77 | + $content = $widget_args[ 'content' ]; |
|
78 | 78 | |
79 | 79 | $content = GravityView_Merge_Tags::replace_variables( $content, array(), array(), false, true, false ); |
80 | 80 | |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | |
85 | 85 | |
86 | 86 | // Add custom class |
87 | - $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
87 | + $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
88 | 88 | $class = gravityview_sanitize_html_class( $class ); |
89 | 89 | |
90 | - echo '<div class="gv-widget-custom-content '.$class.'">'. $content .'</div>'; |
|
90 | + echo '<div class="gv-widget-custom-content ' . $class . '">' . $content . '</div>'; |
|
91 | 91 | |
92 | 92 | } |
93 | 93 |
@@ -41,22 +41,22 @@ |
||
41 | 41 | |
42 | 42 | <?php |
43 | 43 | |
44 | - $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
44 | + $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
45 | 45 | |
46 | - foreach ( $search_field['choices'] as $k => $choice ) { |
|
46 | + foreach ( $search_field['choices'] as $k => $choice ) { |
|
47 | 47 | |
48 | - if ( 0 != $k ) { |
|
49 | - echo esc_html( $links_sep ); |
|
50 | - } |
|
48 | + if ( 0 != $k ) { |
|
49 | + echo esc_html( $links_sep ); |
|
50 | + } |
|
51 | 51 | |
52 | - $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
52 | + $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
53 | 53 | |
54 | - if ( $active ) { |
|
55 | - $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
56 | - } else { |
|
57 | - $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
58 | - } |
|
59 | - ?> |
|
54 | + if ( $active ) { |
|
55 | + $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
56 | + } else { |
|
57 | + $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
58 | + } |
|
59 | + ?> |
|
60 | 60 | |
61 | 61 | <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a> |
62 | 62 |
@@ -13,12 +13,12 @@ discard block |
||
13 | 13 | $base_url = GravityView_Widget_Search::get_search_form_action(); |
14 | 14 | |
15 | 15 | // Make sure that there are choices to display |
16 | -if ( empty( $search_field['choices'] ) ) { |
|
16 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
17 | 17 | gravityview()->log->debug( 'search-field-link.php - No choices for field' ); |
18 | 18 | return; |
19 | 19 | } |
20 | 20 | |
21 | -$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label']; |
|
21 | +$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ]; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type |
@@ -41,24 +41,24 @@ discard block |
||
41 | 41 | |
42 | 42 | <?php |
43 | 43 | |
44 | - $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
44 | + $search_value = \GV\Utils::_GET( $search_field[ 'name' ] ); |
|
45 | 45 | |
46 | - foreach ( $search_field['choices'] as $k => $choice ) { |
|
46 | + foreach ( $search_field[ 'choices' ] as $k => $choice ) { |
|
47 | 47 | |
48 | 48 | if ( 0 != $k ) { |
49 | 49 | echo esc_html( $links_sep ); |
50 | 50 | } |
51 | 51 | |
52 | - $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
52 | + $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false; |
|
53 | 53 | |
54 | 54 | if ( $active ) { |
55 | - $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
55 | + $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url ); |
|
56 | 56 | } else { |
57 | - $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
57 | + $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) ); |
|
58 | 58 | } |
59 | 59 | ?> |
60 | 60 | |
61 | - <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a> |
|
61 | + <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a> |
|
62 | 62 | |
63 | 63 | <?php } ?> |
64 | 64 | </p> |
@@ -10,22 +10,22 @@ |
||
10 | 10 | $search_field = $gravityview_view->search_field; |
11 | 11 | |
12 | 12 | // Make sure that there are choices to display |
13 | -if( empty( $search_field['choices'] ) ) { |
|
13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
14 | 14 | gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' ); |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | 18 | ?> |
19 | 19 | <div class="gv-search-box gv-search-field-checkbox"> |
20 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
21 | - <label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label> |
|
20 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
21 | + <label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
22 | 22 | <?php } ?> |
23 | 23 | <p> |
24 | - <?php foreach( $search_field['choices'] as $choice ) { ?> |
|
24 | + <?php foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
25 | 25 | |
26 | - <label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio"> |
|
27 | - <input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>> |
|
28 | - <?php echo esc_html( $choice['text'] ); ?> |
|
26 | + <label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio"> |
|
27 | + <input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>> |
|
28 | + <?php echo esc_html( $choice[ 'text' ] ); ?> |
|
29 | 29 | </label> |
30 | 30 | |
31 | 31 | <?php } ?> |