@@ -63,7 +63,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -20,12 +20,12 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | function __construct() { |
| 22 | 22 | |
| 23 | - add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30); |
|
| 23 | + add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 ); |
|
| 24 | 24 | |
| 25 | - add_action( 'admin_footer', array( $this, 'add_shortcode_popup') ); |
|
| 25 | + add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) ); |
|
| 26 | 26 | |
| 27 | 27 | // adding styles and scripts |
| 28 | - add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') ); |
|
| 28 | + add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) ); |
|
| 29 | 29 | |
| 30 | 30 | // ajax - populate sort fields based on the selected view |
| 31 | 31 | add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) ); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | function is_post_editor_screen() { |
| 42 | 42 | global $current_screen, $pagenow; |
| 43 | - return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) ); |
|
| 43 | + return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) ); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -55,15 +55,15 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * @since 1.15.3 |
| 57 | 57 | */ |
| 58 | - if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) { |
|
| 58 | + if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) { |
|
| 59 | 59 | return; |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - if( !$this->is_post_editor_screen() ) { |
|
| 62 | + if ( ! $this->is_post_editor_screen() ) { |
|
| 63 | 63 | return; |
| 64 | 64 | } |
| 65 | 65 | ?> |
| 66 | - <a href="#TB_inline?width=600&height=800&inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a> |
|
| 66 | + <a href="#TB_inline?width=600&height=800&inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a> |
|
| 67 | 67 | <?php |
| 68 | 68 | |
| 69 | 69 | } |
@@ -79,16 +79,16 @@ discard block |
||
| 79 | 79 | function add_shortcode_popup() { |
| 80 | 80 | global $post; |
| 81 | 81 | |
| 82 | - if( !$this->is_post_editor_screen() ) { |
|
| 82 | + if ( ! $this->is_post_editor_screen() ) { |
|
| 83 | 83 | return; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - $post_type = get_post_type_object($post->post_type); |
|
| 86 | + $post_type = get_post_type_object( $post->post_type ); |
|
| 87 | 87 | |
| 88 | - $views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) ); |
|
| 88 | + $views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) ); |
|
| 89 | 89 | |
| 90 | 90 | // If there are no views set up yet, we get outta here. |
| 91 | - if( empty( $views ) ) { |
|
| 91 | + if ( empty( $views ) ) { |
|
| 92 | 92 | echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>'; |
| 93 | 93 | return; |
| 94 | 94 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | <div class="wrap"> |
| 100 | 100 | |
| 101 | 101 | <h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2> |
| 102 | - <p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="http://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p> |
|
| 102 | + <p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="http://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p> |
|
| 103 | 103 | |
| 104 | 104 | <div> |
| 105 | 105 | <h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3> |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | <select name="gravityview_id" id="gravityview_id"> |
| 108 | 108 | <option value=""><?php esc_html_e( '— Select a View to Insert —', 'gravityview' ); ?></option> |
| 109 | 109 | <?php |
| 110 | - foreach( $views as $view ) { |
|
| 111 | - $title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title; |
|
| 112 | - echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>'; |
|
| 110 | + foreach ( $views as $view ) { |
|
| 111 | + $title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title; |
|
| 112 | + echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>'; |
|
| 113 | 113 | } |
| 114 | 114 | ?> |
| 115 | 115 | </select> |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | foreach ( $settings as $key => $setting ) { |
| 127 | 127 | |
| 128 | - if( empty( $setting['show_in_shortcode'] ) ) { continue; } |
|
| 128 | + if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; } |
|
| 129 | 129 | |
| 130 | 130 | GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' ); |
| 131 | 131 | } |
@@ -134,8 +134,8 @@ discard block |
||
| 134 | 134 | </table> |
| 135 | 135 | |
| 136 | 136 | <div class="submit"> |
| 137 | - <input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" /> |
|
| 138 | - <input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" /> |
|
| 137 | + <input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" /> |
|
| 138 | + <input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" /> |
|
| 139 | 139 | </div> |
| 140 | 140 | |
| 141 | 141 | </div> |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | function add_scripts_and_styles() { |
| 158 | 158 | |
| 159 | - if( ! $this->is_post_editor_screen() ) { |
|
| 159 | + if ( ! $this->is_post_editor_screen() ) { |
|
| 160 | 160 | return; |
| 161 | 161 | } |
| 162 | 162 | |
@@ -167,22 +167,22 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | $protocol = is_ssl() ? 'https://' : 'http://'; |
| 169 | 169 | |
| 170 | - wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version ); |
|
| 170 | + wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version ); |
|
| 171 | 171 | |
| 172 | 172 | //enqueue styles |
| 173 | - wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version ); |
|
| 173 | + wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version ); |
|
| 174 | 174 | wp_enqueue_style( 'gravityview_postedit_styles' ); |
| 175 | 175 | |
| 176 | - $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
| 176 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
| 177 | 177 | |
| 178 | 178 | // custom js |
| 179 | - wp_register_script( 'gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version ); |
|
| 179 | + wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version ); |
|
| 180 | 180 | wp_enqueue_script( 'gravityview_postedit_scripts' ); |
| 181 | - wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array( |
|
| 182 | - 'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'), |
|
| 181 | + wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array( |
|
| 182 | + 'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ), |
|
| 183 | 183 | 'loading_text' => esc_html__( 'Loading…', 'gravityview' ), |
| 184 | - 'alert_1' => esc_html__( 'Please select a View', 'gravityview'), |
|
| 185 | - )); |
|
| 184 | + 'alert_1' => esc_html__( 'Please select a View', 'gravityview' ), |
|
| 185 | + ) ); |
|
| 186 | 186 | |
| 187 | 187 | } |
| 188 | 188 | |
@@ -198,16 +198,16 @@ discard block |
||
| 198 | 198 | function get_sortable_fields() { |
| 199 | 199 | |
| 200 | 200 | // Not properly formatted request |
| 201 | - if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) { |
|
| 201 | + if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) { |
|
| 202 | 202 | exit( false ); |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | // Not valid request |
| 206 | - if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) { |
|
| 206 | + if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) { |
|
| 207 | 207 | exit( false ); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - $viewid = (int)$_POST['viewid']; |
|
| 210 | + $viewid = (int)$_POST[ 'viewid' ]; |
|
| 211 | 211 | |
| 212 | 212 | // fetch form id assigned to the view |
| 213 | 213 | $formid = gravityview_get_form_id( $viewid ); |
@@ -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': |
@@ -247,9 +247,9 @@ discard block |
||
| 247 | 247 | foreach ( $choices as $key => $choice ) { |
| 248 | 248 | |
| 249 | 249 | // Is the passed status value the same as the choice value or key? |
| 250 | - if ( $status === $choice['value'] || $status === $key ) { |
|
| 250 | + if ( $status === $choice[ 'value' ] || $status === $key ) { |
|
| 251 | 251 | |
| 252 | - if( 'key' === $attr_key ) { |
|
| 252 | + if ( 'key' === $attr_key ) { |
|
| 253 | 253 | return $key; |
| 254 | 254 | } else { |
| 255 | 255 | return rgar( $choice, $attr_key, false ); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | // Load even when invalid to allow for export |
| 20 | 20 | add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) ); |
| 21 | 21 | |
| 22 | - if( GravityView_Compatibility::is_valid() ) { |
|
| 22 | + if ( GravityView_Compatibility::is_valid() ) { |
|
| 23 | 23 | add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) ); |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $supports = array( 'title', 'revisions' ); |
| 45 | 45 | |
| 46 | - if( $is_hierarchical ) { |
|
| 47 | - $supports[] = 'page-attributes'; |
|
| 46 | + if ( $is_hierarchical ) { |
|
| 47 | + $supports[ ] = 'page-attributes'; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -63,18 +63,18 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) ); |
| 65 | 65 | |
| 66 | - add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 ); |
|
| 67 | - add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
| 68 | - add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
| 66 | + add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 ); |
|
| 67 | + add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
| 68 | + add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
| 69 | 69 | |
| 70 | - add_action( 'wp', array( $this, 'maybe_add_note'), 1000 ); |
|
| 71 | - add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') ); |
|
| 72 | - add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') ); |
|
| 70 | + add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 ); |
|
| 71 | + add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
| 72 | + add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
| 73 | 73 | |
| 74 | 74 | // add template path to check for field |
| 75 | 75 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
| 76 | 76 | |
| 77 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 77 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 78 | 78 | add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) ); |
| 79 | 79 | |
| 80 | 80 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 ); |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function add_entry_default_field( $entry_default_fields, $form, $zone ) { |
| 98 | 98 | |
| 99 | - if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 100 | - $entry_default_fields['notes'] = array( |
|
| 99 | + if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 100 | + $entry_default_fields[ 'notes' ] = array( |
|
| 101 | 101 | 'label' => __( 'Entry Notes', 'gravityview' ), |
| 102 | 102 | 'type' => 'notes', |
| 103 | 103 | 'desc' => __( 'Display, add, and delete notes for an entry.', 'gravityview' ), |
@@ -130,23 +130,23 @@ discard block |
||
| 130 | 130 | public function enqueue_scripts() { |
| 131 | 131 | global $wp_actions; |
| 132 | 132 | |
| 133 | - if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
| 133 | + if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
| 134 | 134 | wp_enqueue_style( 'gravityview-notes' ); |
| 135 | 135 | wp_enqueue_script( 'gravityview-notes' ); |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - if( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
| 138 | + if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
| 139 | 139 | |
| 140 | 140 | $strings = self::strings(); |
| 141 | 141 | |
| 142 | 142 | wp_localize_script( 'gravityview-notes', 'GVNotes', array( |
| 143 | 143 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
| 144 | 144 | 'text' => array( |
| 145 | - 'processing' => $strings['processing'], |
|
| 146 | - 'delete_confirm' => $strings['delete-confirm'], |
|
| 147 | - 'note_added' => $strings['added-note'], |
|
| 148 | - 'error_invalid' => $strings['error-invalid'], |
|
| 149 | - 'error_empty_note' => $strings['error-empty-note'], |
|
| 145 | + 'processing' => $strings[ 'processing' ], |
|
| 146 | + 'delete_confirm' => $strings[ 'delete-confirm' ], |
|
| 147 | + 'note_added' => $strings[ 'added-note' ], |
|
| 148 | + 'error_invalid' => $strings[ 'error-invalid' ], |
|
| 149 | + 'error_empty_note' => $strings[ 'error-empty-note' ], |
|
| 150 | 150 | ), |
| 151 | 151 | ) ); |
| 152 | 152 | } |
@@ -163,22 +163,22 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | function maybe_add_note() { |
| 165 | 165 | |
| 166 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 166 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 167 | 167 | do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
| 168 | 168 | return; |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - if( 'gv_note_add' === rgpost('action') ) { |
|
| 171 | + if ( 'gv_note_add' === rgpost( 'action' ) ) { |
|
| 172 | 172 | |
| 173 | 173 | $post = wp_unslash( $_POST ); |
| 174 | 174 | |
| 175 | - if( $this->doing_ajax ) { |
|
| 176 | - parse_str( $post['data'], $data ); |
|
| 175 | + if ( $this->doing_ajax ) { |
|
| 176 | + parse_str( $post[ 'data' ], $data ); |
|
| 177 | 177 | } else { |
| 178 | 178 | $data = $post; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - $this->process_add_note( (array) $data ); |
|
| 181 | + $this->process_add_note( (array)$data ); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
@@ -205,23 +205,23 @@ discard block |
||
| 205 | 205 | $error = false; |
| 206 | 206 | $success = false; |
| 207 | 207 | |
| 208 | - if( empty( $data['entry-slug'] ) ) { |
|
| 208 | + if ( empty( $data[ 'entry-slug' ] ) ) { |
|
| 209 | 209 | |
| 210 | - $error = self::strings('error-invalid'); |
|
| 210 | + $error = self::strings( 'error-invalid' ); |
|
| 211 | 211 | do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' ); |
| 212 | 212 | |
| 213 | 213 | } else { |
| 214 | 214 | |
| 215 | - $valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] ); |
|
| 215 | + $valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] ); |
|
| 216 | 216 | |
| 217 | 217 | $has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' ); |
| 218 | 218 | |
| 219 | - if( ! $has_cap ) { |
|
| 219 | + if ( ! $has_cap ) { |
|
| 220 | 220 | $error = self::strings( 'error-cap-add' ); |
| 221 | 221 | do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' ); |
| 222 | 222 | } elseif ( $valid ) { |
| 223 | 223 | |
| 224 | - $entry = gravityview_get_entry( $data['entry-slug'], true, false ); |
|
| 224 | + $entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false ); |
|
| 225 | 225 | |
| 226 | 226 | $added = $this->add_note( $entry, $data ); |
| 227 | 227 | |
@@ -239,22 +239,22 @@ discard block |
||
| 239 | 239 | $this->maybe_send_entry_notes( $note, $entry, $data ); |
| 240 | 240 | |
| 241 | 241 | if ( $note ) { |
| 242 | - $success = self::display_note( $note, ! empty( $data['show-delete'] ) ); |
|
| 243 | - do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') ); |
|
| 242 | + $success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) ); |
|
| 243 | + do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) ); |
|
| 244 | 244 | } else { |
| 245 | - $error = self::strings('error-add-note'); |
|
| 246 | - do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') ); |
|
| 245 | + $error = self::strings( 'error-add-note' ); |
|
| 246 | + do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) ); |
|
| 247 | 247 | } |
| 248 | 248 | } |
| 249 | 249 | } else { |
| 250 | - $error = self::strings('error-invalid'); |
|
| 250 | + $error = self::strings( 'error-invalid' ); |
|
| 251 | 251 | do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' ); |
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | |
| 256 | - if( $this->doing_ajax ) { |
|
| 257 | - if( $success ) { |
|
| 256 | + if ( $this->doing_ajax ) { |
|
| 257 | + if ( $success ) { |
|
| 258 | 258 | wp_send_json_success( array( 'html' => $success ) ); |
| 259 | 259 | } else { |
| 260 | 260 | $error = $error ? $error : self::strings( 'error-invalid' ); |
@@ -280,11 +280,11 @@ discard block |
||
| 280 | 280 | return; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) { |
|
| 283 | + if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) { |
|
| 284 | 284 | |
| 285 | 285 | $post = wp_unslash( $_POST ); |
| 286 | 286 | if ( $this->doing_ajax ) { |
| 287 | - parse_str( $post['data'], $data ); |
|
| 287 | + parse_str( $post[ 'data' ], $data ); |
|
| 288 | 288 | } else { |
| 289 | 289 | $data = $post; |
| 290 | 290 | } |
@@ -315,18 +315,18 @@ discard block |
||
| 315 | 315 | */ |
| 316 | 316 | function process_delete_notes( $data ) { |
| 317 | 317 | |
| 318 | - $valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] ); |
|
| 318 | + $valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] ); |
|
| 319 | 319 | $has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' ); |
| 320 | 320 | $success = false; |
| 321 | 321 | |
| 322 | 322 | if ( $valid && $has_cap ) { |
| 323 | - GravityView_Entry_Notes::delete_notes( $data['note'] ); |
|
| 323 | + GravityView_Entry_Notes::delete_notes( $data[ 'note' ] ); |
|
| 324 | 324 | $success = true; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | - if( $this->doing_ajax ) { |
|
| 327 | + if ( $this->doing_ajax ) { |
|
| 328 | 328 | |
| 329 | - if( $success ) { |
|
| 329 | + if ( $success ) { |
|
| 330 | 330 | wp_send_json_success(); |
| 331 | 331 | } else { |
| 332 | 332 | if ( ! $valid ) { |
@@ -359,13 +359,13 @@ discard block |
||
| 359 | 359 | |
| 360 | 360 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 361 | 361 | |
| 362 | - unset( $field_options['show_as_link'] ); |
|
| 362 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 363 | 363 | |
| 364 | 364 | $notes_options = array( |
| 365 | 365 | 'notes' => array( |
| 366 | 366 | 'type' => 'checkboxes', |
| 367 | - 'label' => __('Note Settings', 'gravityview'), |
|
| 368 | - 'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
| 367 | + 'label' => __( 'Note Settings', 'gravityview' ), |
|
| 368 | + 'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
| 369 | 369 | 'options' => array( |
| 370 | 370 | 'view' => array( |
| 371 | 371 | 'label' => __( 'Display notes?', 'gravityview' ), |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | 'processing' => __( 'Processing…', 'gravityview' ), |
| 418 | 418 | 'other-email' => __( 'Other email address', 'gravityview' ), |
| 419 | 419 | 'email-label' => __( 'Email address', 'gravityview' ), |
| 420 | - 'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'), |
|
| 420 | + 'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ), |
|
| 421 | 421 | 'subject-label' => __( 'Subject', 'gravityview' ), |
| 422 | 422 | 'subject' => __( 'Email subject', 'gravityview' ), |
| 423 | 423 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | */ |
| 438 | 438 | $strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' ); |
| 439 | 439 | |
| 440 | - if( $key ) { |
|
| 440 | + if ( $key ) { |
|
| 441 | 441 | return isset( $strings[ $key ] ) ? $strings[ $key ] : ''; |
| 442 | 442 | } |
| 443 | 443 | |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | */ |
| 457 | 457 | static public function display_note( $note, $show_delete = false ) { |
| 458 | 458 | |
| 459 | - if( ! is_object( $note ) ) { |
|
| 459 | + if ( ! is_object( $note ) ) { |
|
| 460 | 460 | return ''; |
| 461 | 461 | } |
| 462 | 462 | |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | $note_row = ob_get_clean(); |
| 498 | 498 | |
| 499 | 499 | $replacements = array( |
| 500 | - '{note_id}' => $note_content['note_id'], |
|
| 500 | + '{note_id}' => $note_content[ 'note_id' ], |
|
| 501 | 501 | '{row_class}' => 'gv-note', |
| 502 | 502 | '{note_detail}' => $note_detail_html |
| 503 | 503 | ); |
@@ -529,13 +529,13 @@ discard block |
||
| 529 | 529 | |
| 530 | 530 | $user_data = get_userdata( $current_user->ID ); |
| 531 | 531 | |
| 532 | - $note_content = trim( $data['gv-note-content'] ); |
|
| 532 | + $note_content = trim( $data[ 'gv-note-content' ] ); |
|
| 533 | 533 | |
| 534 | - if( empty( $note_content ) ) { |
|
| 534 | + if ( empty( $note_content ) ) { |
|
| 535 | 535 | return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) ); |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | - $return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
| 538 | + $return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
| 539 | 539 | |
| 540 | 540 | return $return; |
| 541 | 541 | } |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | */ |
| 552 | 552 | public static function get_add_note_part() { |
| 553 | 553 | |
| 554 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 554 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 555 | 555 | do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' ); |
| 556 | 556 | return ''; |
| 557 | 557 | } |
@@ -564,19 +564,19 @@ discard block |
||
| 564 | 564 | |
| 565 | 565 | $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' ); |
| 566 | 566 | $entry = $gravityview_view->getCurrentEntry(); |
| 567 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 567 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 568 | 568 | $nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false ); |
| 569 | 569 | |
| 570 | 570 | // Only generate the dropdown if the field settings allow it |
| 571 | 571 | $email_fields = ''; |
| 572 | - if( ! empty( $visibility_settings['email'] ) ) { |
|
| 572 | + if ( ! empty( $visibility_settings[ 'email' ] ) ) { |
|
| 573 | 573 | $email_fields = self::get_note_email_fields( $entry_slug ); |
| 574 | 574 | } |
| 575 | 575 | |
| 576 | 576 | $add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html ); |
| 577 | 577 | $add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html ); |
| 578 | - $add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html ); |
|
| 579 | - $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
| 578 | + $add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html ); |
|
| 579 | + $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
| 580 | 580 | $add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html ); |
| 581 | 581 | |
| 582 | 582 | return $add_note_html; |
@@ -601,8 +601,8 @@ discard block |
||
| 601 | 601 | $note_emails = array(); |
| 602 | 602 | |
| 603 | 603 | foreach ( $email_fields as $email_field ) { |
| 604 | - if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) { |
|
| 605 | - $note_emails[] = $entry["{$email_field->id}"]; |
|
| 604 | + if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) { |
|
| 605 | + $note_emails[ ] = $entry[ "{$email_field->id}" ]; |
|
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | 608 | |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | $note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry ); |
| 616 | 616 | |
| 617 | - return (array) $note_emails; |
|
| 617 | + return (array)$note_emails; |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | /** |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | */ |
| 631 | 631 | private static function get_note_email_fields( $entry_slug = '' ) { |
| 632 | 632 | |
| 633 | - if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 633 | + if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 634 | 634 | do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' ); |
| 635 | 635 | return ''; |
| 636 | 636 | } |
@@ -652,27 +652,27 @@ discard block |
||
| 652 | 652 | |
| 653 | 653 | if ( ! empty( $note_emails ) || $include_custom ) { ?> |
| 654 | 654 | <div class="gv-note-email-container"> |
| 655 | - <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email']; ?></label> |
|
| 655 | + <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label> |
|
| 656 | 656 | <select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>"> |
| 657 | - <option value=""><?php echo $strings['also-email']; ?></option> |
|
| 657 | + <option value=""><?php echo $strings[ 'also-email' ]; ?></option> |
|
| 658 | 658 | <?php foreach ( $note_emails as $email ) { |
| 659 | 659 | ?> |
| 660 | 660 | <option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option> |
| 661 | 661 | <?php } |
| 662 | - if( $include_custom ) { ?> |
|
| 663 | - <option value="custom"><?php echo self::strings('other-email'); ?></option> |
|
| 662 | + if ( $include_custom ) { ?> |
|
| 663 | + <option value="custom"><?php echo self::strings( 'other-email' ); ?></option> |
|
| 664 | 664 | <?php } ?> |
| 665 | 665 | </select> |
| 666 | 666 | <fieldset class="gv-note-to-container"> |
| 667 | - <?php if( $include_custom ) { ?> |
|
| 667 | + <?php if ( $include_custom ) { ?> |
|
| 668 | 668 | <div class='gv-note-to-custom-container'> |
| 669 | - <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label> |
|
| 670 | - <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 669 | + <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label> |
|
| 670 | + <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 671 | 671 | </div> |
| 672 | 672 | <?php } ?> |
| 673 | 673 | <div class='gv-note-subject-container'> |
| 674 | - <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label> |
|
| 675 | - <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 674 | + <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label> |
|
| 675 | + <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 676 | 676 | </div> |
| 677 | 677 | </fieldset> |
| 678 | 678 | </div> |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | */ |
| 696 | 696 | private function maybe_send_entry_notes( $note = false, $entry, $data ) { |
| 697 | 697 | |
| 698 | - if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) { |
|
| 698 | + if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 699 | 699 | do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note ); |
| 700 | 700 | return; |
| 701 | 701 | } |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data ); |
| 704 | 704 | |
| 705 | 705 | //emailing notes if configured |
| 706 | - if ( ! empty( $data['gv-note-to'] ) ) { |
|
| 706 | + if ( ! empty( $data[ 'gv-note-to' ] ) ) { |
|
| 707 | 707 | |
| 708 | 708 | $default_data = array( |
| 709 | 709 | 'gv-note-to' => '', |
@@ -713,11 +713,11 @@ discard block |
||
| 713 | 713 | 'current-url' => '', |
| 714 | 714 | ); |
| 715 | 715 | |
| 716 | - $current_user = wp_get_current_user(); |
|
| 716 | + $current_user = wp_get_current_user(); |
|
| 717 | 717 | $email_data = wp_parse_args( $data, $default_data ); |
| 718 | 718 | |
| 719 | - $from = $current_user->user_email; |
|
| 720 | - $to = $email_data['gv-note-to']; |
|
| 719 | + $from = $current_user->user_email; |
|
| 720 | + $to = $email_data[ 'gv-note-to' ]; |
|
| 721 | 721 | |
| 722 | 722 | /** |
| 723 | 723 | * Documented in get_note_email_fields |
@@ -725,8 +725,8 @@ discard block |
||
| 725 | 725 | */ |
| 726 | 726 | $include_custom = apply_filters( 'gravityview/field/notes/custom-email', true ); |
| 727 | 727 | |
| 728 | - if( 'custom' === $to && $include_custom ) { |
|
| 729 | - $to = $email_data['gv-note-to-custom']; |
|
| 728 | + if ( 'custom' === $to && $include_custom ) { |
|
| 729 | + $to = $email_data[ 'gv-note-to-custom' ]; |
|
| 730 | 730 | do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to ); |
| 731 | 731 | } |
| 732 | 732 | |
@@ -737,13 +737,13 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | $bcc = false; |
| 739 | 739 | $reply_to = $from; |
| 740 | - $subject = trim( $email_data['gv-note-subject'] ); |
|
| 740 | + $subject = trim( $email_data[ 'gv-note-subject' ] ); |
|
| 741 | 741 | |
| 742 | 742 | // We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF |
| 743 | 743 | $subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject; |
| 744 | - $message = $email_data['gv-note-content']; |
|
| 744 | + $message = $email_data[ 'gv-note-content' ]; |
|
| 745 | 745 | $email_footer = self::strings( 'email-footer' ); |
| 746 | - $from_name = $current_user->display_name; |
|
| 746 | + $from_name = $current_user->display_name; |
|
| 747 | 747 | $message_format = 'html'; |
| 748 | 748 | |
| 749 | 749 | /** |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | |
| 775 | 775 | GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false ); |
| 776 | 776 | |
| 777 | - $form = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array(); |
|
| 777 | + $form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array(); |
|
| 778 | 778 | |
| 779 | 779 | /** |
| 780 | 780 | * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms |
@@ -800,7 +800,7 @@ discard block |
||
| 800 | 800 | |
| 801 | 801 | $output = ''; |
| 802 | 802 | |
| 803 | - if( ! empty( $email_footer ) ) { |
|
| 803 | + if ( ! empty( $email_footer ) ) { |
|
| 804 | 804 | $url = rgar( $email_data, 'current-url' ); |
| 805 | 805 | $url = html_entity_decode( $url ); |
| 806 | 806 | $url = site_url( $url ); |
@@ -49,8 +49,8 @@ discard block |
||
| 49 | 49 | do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts ); |
| 50 | 50 | |
| 51 | 51 | // Get details about the current View |
| 52 | - if( !empty( $passed_atts['detail'] ) ) { |
|
| 53 | - return $this->get_view_detail( $passed_atts['detail'] ); |
|
| 52 | + if ( ! empty( $passed_atts[ 'detail' ] ) ) { |
|
| 53 | + return $this->get_view_detail( $passed_atts[ 'detail' ] ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $atts = $this->parse_and_sanitize_atts( $passed_atts ); |
@@ -86,16 +86,16 @@ discard block |
||
| 86 | 86 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
| 87 | 87 | |
| 88 | 88 | // Only keep the passed attributes after making sure that they're valid pairs |
| 89 | - $filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array) $passed_atts, $filtered_atts ) : $filtered_atts; |
|
| 89 | + $filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array)$passed_atts, $filtered_atts ) : $filtered_atts; |
|
| 90 | 90 | |
| 91 | 91 | $atts = array(); |
| 92 | 92 | |
| 93 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
| 93 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
| 94 | 94 | |
| 95 | 95 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
| 96 | 96 | $passed_value = GravityView_Merge_Tags::replace_variables( $passed_value ); |
| 97 | 97 | |
| 98 | - switch( $defaults[ $key ]['type'] ) { |
|
| 98 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | 101 | * Make sure number fields are numeric. |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
| 104 | 104 | */ |
| 105 | 105 | case 'number': |
| 106 | - if( is_numeric( $passed_value ) ) { |
|
| 106 | + if ( is_numeric( $passed_value ) ) { |
|
| 107 | 107 | $atts[ $key ] = ( $passed_value + 0 ); |
| 108 | 108 | } |
| 109 | 109 | break; |
@@ -118,8 +118,8 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | case 'select': |
| 120 | 120 | case 'radio': |
| 121 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
| 122 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 121 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
| 122 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 123 | 123 | $atts[ $key ] = $passed_value; |
| 124 | 124 | } |
| 125 | 125 | break; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $gravityview_view = GravityView_View::getInstance(); |
| 149 | 149 | $return = ''; |
| 150 | 150 | |
| 151 | - switch( $detail ) { |
|
| 151 | + switch ( $detail ) { |
|
| 152 | 152 | case 'total_entries': |
| 153 | 153 | $return = number_format_i18n( $gravityview_view->getTotalEntries() ); |
| 154 | 154 | break; |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | ?> |
| 10 | 10 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php |
| 11 | 11 | |
| 12 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; |
|
| 12 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; |
|
| 13 | 13 | echo $this->get_tooltip() . $this->get_field_desc(); |
| 14 | 14 | ?><div> |
| 15 | 15 | <?php $this->render_input(); ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | function render_input( $override_input = null ) { |
| 22 | - if( isset( $override_input ) ) { |
|
| 22 | + if ( isset( $override_input ) ) { |
|
| 23 | 23 | echo $override_input; |
| 24 | 24 | return; |
| 25 | 25 | } |
@@ -28,17 +28,17 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 31 | + if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { |
|
| 32 | 32 | $class .= ' merge-tag-support mt-position-right '; |
| 33 | 33 | |
| 34 | - if( empty( $this->field['show_all_fields'] ) ) { |
|
| 34 | + if ( empty( $this->field[ 'show_all_fields' ] ) ) { |
|
| 35 | 35 | $class .= ' mt-hide_all_fields '; |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | $class .= rgar( $this->field, 'class' ); |
| 39 | 39 | $placeholder = rgar( $this->field, 'placeholder' ); |
| 40 | 40 | ?> |
| 41 | - <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea> |
|
| 41 | + <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea> |
|
| 42 | 42 | <?php |
| 43 | 43 | } |
| 44 | 44 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | ?> |
| 9 | 9 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php |
| 10 | 10 | |
| 11 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; |
|
| 11 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; |
|
| 12 | 12 | echo $this->get_tooltip() . $this->get_field_desc(); |
| 13 | 13 | ?><div> |
| 14 | 14 | <?php $this->render_input(); ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | function render_input( $override_input = null ) { |
| 21 | 21 | |
| 22 | - if( isset( $override_input ) ) { |
|
| 22 | + if ( isset( $override_input ) ) { |
|
| 23 | 23 | echo $override_input; |
| 24 | 24 | return; |
| 25 | 25 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 31 | + if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { |
|
| 32 | 32 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
| 33 | 33 | } |
| 34 | 34 | $class .= rgar( $this->field, 'class', 'widefat' ); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | function add_default_field( $entry_default_fields, $form, $zone ) { |
| 94 | 94 | |
| 95 | - if( 'edit' !== $zone ) { |
|
| 95 | + if ( 'edit' !== $zone ) { |
|
| 96 | 96 | $entry_default_fields[ $this->name ] = array( |
| 97 | 97 | 'label' => $this->label, |
| 98 | 98 | 'desc' => $this->description, |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $merge_tags = array( |
| 119 | 119 | array( |
| 120 | - 'label' => __('Approval Status', 'gravityview'), |
|
| 120 | + 'label' => __( 'Approval Status', 'gravityview' ), |
|
| 121 | 121 | 'tag' => '{approval_status}' |
| 122 | 122 | ), |
| 123 | 123 | ); |
@@ -157,10 +157,10 @@ discard block |
||
| 157 | 157 | do_action( 'gravityview_log_error', __METHOD__ . ': No entry data available. Returning empty string.' ); |
| 158 | 158 | $replacement = ''; |
| 159 | 159 | } else { |
| 160 | - $replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] ); |
|
| 160 | + $replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] ); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - $return = str_replace( $match[0], $replacement, $return ); |
|
| 163 | + $return = str_replace( $match[ 0 ], $replacement, $return ); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | return $return; |
@@ -168,25 +168,25 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 170 | 170 | |
| 171 | - $field_options['approved_label'] = array( |
|
| 171 | + $field_options[ 'approved_label' ] = array( |
|
| 172 | 172 | 'type' => 'text', |
| 173 | 173 | 'label' => __( 'Approved Label', 'gravityview' ), |
| 174 | 174 | 'desc' => __( 'If the entry is approved, display this value', 'gravityview' ), |
| 175 | - 'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'), |
|
| 175 | + 'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ), |
|
| 176 | 176 | ); |
| 177 | 177 | |
| 178 | - $field_options['disapproved_label'] = array( |
|
| 178 | + $field_options[ 'disapproved_label' ] = array( |
|
| 179 | 179 | 'type' => 'text', |
| 180 | 180 | 'label' => __( 'Disapproved Label', 'gravityview' ), |
| 181 | 181 | 'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ), |
| 182 | - 'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'), |
|
| 182 | + 'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ), |
|
| 183 | 183 | ); |
| 184 | 184 | |
| 185 | - $field_options['unapproved_label'] = array( |
|
| 185 | + $field_options[ 'unapproved_label' ] = array( |
|
| 186 | 186 | 'type' => 'text', |
| 187 | 187 | 'label' => __( 'Unapproved Label', 'gravityview' ), |
| 188 | 188 | 'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ), |
| 189 | - 'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'), |
|
| 189 | + 'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ), |
|
| 190 | 190 | ); |
| 191 | 191 | |
| 192 | 192 | return $field_options; |