@@ -11,10 +11,10 @@ |
||
| 11 | 11 | ?> |
| 12 | 12 | |
| 13 | 13 | <div class="gv-search-box gv-search-date"> |
| 14 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 15 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 14 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 15 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 16 | 16 | <?php } ?> |
| 17 | 17 | <p> |
| 18 | - <input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" > |
|
| 18 | + <input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" > |
|
| 19 | 19 | </p> |
| 20 | 20 | </div> |
| 21 | 21 | \ No newline at end of file |
@@ -10,10 +10,10 @@ |
||
| 10 | 10 | |
| 11 | 11 | ?> |
| 12 | 12 | <div class="gv-search-box gv-search-field-text"> |
| 13 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 14 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 13 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 14 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 15 | 15 | <?php } ?> |
| 16 | 16 | <p> |
| 17 | - <input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"> |
|
| 17 | + <input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"> |
|
| 18 | 18 | </p> |
| 19 | 19 | </div> |
| 20 | 20 | \ No newline at end of file |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | ?> |
| 13 | 13 | |
| 14 | 14 | <div class="gv-search-box gv-search-field-single_checkbox"> |
| 15 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" class="gv-check-radio"> |
|
| 16 | - <input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" <?php checked( '1', $search_field['value'], true ); ?>> |
|
| 17 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { echo esc_html( $search_field['label'] ); } ?> |
|
| 15 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" class="gv-check-radio"> |
|
| 16 | + <input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" <?php checked( '1', $search_field[ 'value' ], true ); ?>> |
|
| 17 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { echo esc_html( $search_field[ 'label' ] ); } ?> |
|
| 18 | 18 | </label> |
| 19 | 19 | </div> |
| 20 | 20 | \ No newline at end of file |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | $sidebars_widgets = wp_get_sidebars_widgets(); |
| 82 | - if ( empty( $sidebars_widgets[ $matches[1] ] ) ) { |
|
| 82 | + if ( empty( $sidebars_widgets[ $matches[ 1 ] ] ) ) { |
|
| 83 | 83 | return $shortcodes; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - foreach ( $sidebars_widgets[ $matches[1] ] as $widgets ) { |
|
| 86 | + foreach ( $sidebars_widgets[ $matches[ 1 ] ] as $widgets ) { |
|
| 87 | 87 | if ( |
| 88 | 88 | /** |
| 89 | 89 | * Blacklisted widgets. |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | strpos( $widgets, 'gv_recent_entries' ) === 0 |
| 93 | 93 | ) { |
| 94 | 94 | |
| 95 | - $shortcodes []= 'et_pb_sidebar'; |
|
| 95 | + $shortcodes [ ] = 'et_pb_sidebar'; |
|
| 96 | 96 | break; |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -42,16 +42,16 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $args = wp_parse_args( $args, $defaults ); |
| 44 | 44 | |
| 45 | - $forms = gravityview_get_forms( (bool) $args['active'], (bool) $args['trash'] ); |
|
| 45 | + $forms = gravityview_get_forms( (bool)$args[ 'active' ], (bool)$args[ 'trash' ] ); |
|
| 46 | 46 | |
| 47 | - if( array() === $args['options'] ) { |
|
| 47 | + if ( array() === $args[ 'options' ] ) { |
|
| 48 | 48 | foreach ( $forms as $form ) { |
| 49 | 49 | |
| 50 | - if ( in_array( $form['id'], $args['exclude'] ) ) { |
|
| 50 | + if ( in_array( $form[ 'id' ], $args[ 'exclude' ] ) ) { |
|
| 51 | 51 | continue; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - $args['options'][ $form['id'] ] = esc_html( $form['title'] ); |
|
| 54 | + $args[ 'options' ][ $form[ 'id' ] ] = esc_html( $form[ 'title' ] ); |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
@@ -83,15 +83,15 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $args = wp_parse_args( $args, $defaults ); |
| 85 | 85 | |
| 86 | - if( empty( $args['form_id'] ) ) { |
|
| 86 | + if ( empty( $args[ 'form_id' ] ) ) { |
|
| 87 | 87 | return ''; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - $fields = GVCommon::get_sortable_fields_array( $args['form_id'] ); |
|
| 90 | + $fields = GVCommon::get_sortable_fields_array( $args[ 'form_id' ] ); |
|
| 91 | 91 | |
| 92 | - if( array() === $args['options'] ) { |
|
| 92 | + if ( array() === $args[ 'options' ] ) { |
|
| 93 | 93 | foreach ( $fields as $field_id => $field ) { |
| 94 | - $args['options'][ $field_id ] = esc_html( $field['label'] ); |
|
| 94 | + $args[ 'options' ][ $field_id ] = esc_html( $field[ 'label' ] ); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
@@ -127,43 +127,43 @@ discard block |
||
| 127 | 127 | $args = wp_parse_args( $args, $defaults ); |
| 128 | 128 | |
| 129 | 129 | $data_elements = ''; |
| 130 | - foreach ( $args['data'] as $key => $value ) { |
|
| 130 | + foreach ( $args[ 'data' ] as $key => $value ) { |
|
| 131 | 131 | $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"'; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - if( $args['multiple'] ) { |
|
| 134 | + if ( $args[ 'multiple' ] ) { |
|
| 135 | 135 | $multiple = ' MULTIPLE'; |
| 136 | 136 | } else { |
| 137 | 137 | $multiple = ''; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - if( $args['placeholder'] ) { |
|
| 141 | - $placeholder = $args['placeholder']; |
|
| 140 | + if ( $args[ 'placeholder' ] ) { |
|
| 141 | + $placeholder = $args[ 'placeholder' ]; |
|
| 142 | 142 | } else { |
| 143 | 143 | $placeholder = ''; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - $disabled = $args['disabled'] ? ' disabled="disabled"' : ''; |
|
| 147 | - $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) ); |
|
| 148 | - $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( str_replace( '-', '_', $args['id'] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"'. $data_elements . '>'; |
|
| 146 | + $disabled = $args[ 'disabled' ] ? ' disabled="disabled"' : ''; |
|
| 147 | + $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args[ 'class' ] ) ) ); |
|
| 148 | + $output = '<select name="' . esc_attr( $args[ 'name' ] ) . '" id="' . esc_attr( str_replace( '-', '_', $args[ 'id' ] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"' . $data_elements . '>'; |
|
| 149 | 149 | |
| 150 | - if ( ! empty( $args['options'] ) ) { |
|
| 150 | + if ( ! empty( $args[ 'options' ] ) ) { |
|
| 151 | 151 | |
| 152 | - if ( $args['show_option_none'] ) { |
|
| 153 | - if( $args['multiple'] ) { |
|
| 154 | - $selected = selected( true, in_array( -1, $args['selected'] ), false ); |
|
| 152 | + if ( $args[ 'show_option_none' ] ) { |
|
| 153 | + if ( $args[ 'multiple' ] ) { |
|
| 154 | + $selected = selected( true, in_array( -1, $args[ 'selected' ] ), false ); |
|
| 155 | 155 | } else { |
| 156 | - $selected = selected( $args['selected'], -1, false ); |
|
| 156 | + $selected = selected( $args[ 'selected' ], -1, false ); |
|
| 157 | 157 | } |
| 158 | - $output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>'; |
|
| 158 | + $output .= '<option value="-1"' . $selected . '>' . esc_html( $args[ 'show_option_none' ] ) . '</option>'; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - foreach( $args['options'] as $key => $option ) { |
|
| 161 | + foreach ( $args[ 'options' ] as $key => $option ) { |
|
| 162 | 162 | |
| 163 | - if( $args['multiple'] && is_array( $args['selected'] ) ) { |
|
| 164 | - $selected = selected( true, in_array( $key, $args['selected'], true ), false ); |
|
| 163 | + if ( $args[ 'multiple' ] && is_array( $args[ 'selected' ] ) ) { |
|
| 164 | + $selected = selected( true, in_array( $key, $args[ 'selected' ], true ), false ); |
|
| 165 | 165 | } else { |
| 166 | - $selected = selected( $args['selected'], $key, false ); |
|
| 166 | + $selected = selected( $args[ 'selected' ], $key, false ); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>'; |
@@ -43,12 +43,12 @@ discard block |
||
| 43 | 43 | function parse_um_profile_post_content( $args = array() ) { |
| 44 | 44 | global $ultimatemember; |
| 45 | 45 | |
| 46 | - if( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) { |
|
| 46 | + if ( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) { |
|
| 47 | 47 | return; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // @todo Support Ultimate Member 2.0 - for now, prevent fatal error |
| 51 | - if( ! isset( $ultimatemember->profile ) ) { |
|
| 51 | + if ( ! isset( $ultimatemember->profile ) ) { |
|
| 52 | 52 | return; |
| 53 | 53 | } |
| 54 | 54 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | return; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - GravityView_View_Data::getInstance()->parse_post_content( $active_tab[0]->post_content ); |
|
| 67 | + GravityView_View_Data::getInstance()->parse_post_content( $active_tab[ 0 ]->post_content ); |
|
| 68 | 68 | |
| 69 | 69 | wp_reset_postdata(); |
| 70 | 70 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | */ |
| 46 | 46 | function filter_file_path( $file_path = '', $file_path_info = array(), $field_settings = array() ) { |
| 47 | 47 | |
| 48 | - $file_path = str_replace('www.dropbox.com', 'dl.dropboxusercontent.com', $file_path ); |
|
| 48 | + $file_path = str_replace( 'www.dropbox.com', 'dl.dropboxusercontent.com', $file_path ); |
|
| 49 | 49 | $file_path = str_replace( '?dl=0', '', $file_path ); |
| 50 | 50 | |
| 51 | 51 | return $file_path; |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | global $wpdb; |
| 142 | 142 | |
| 143 | 143 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) |
| 144 | - && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) { |
|
| 144 | + && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) { |
|
| 145 | 145 | $notes_table = GFFormsModel::get_entry_notes_table_name(); |
| 146 | 146 | } else { |
| 147 | 147 | $notes_table = GFFormsModel::get_lead_notes_table_name(); |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | // Make sure the keys are all set |
| 68 | 68 | $note = wp_parse_args( $note, $default_note ); |
| 69 | 69 | |
| 70 | - GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) ); |
|
| 70 | + GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) ); |
|
| 71 | 71 | |
| 72 | 72 | // If last_error is empty string, there was no error. |
| 73 | - if( empty( $wpdb->last_error ) ) { |
|
| 73 | + if ( empty( $wpdb->last_error ) ) { |
|
| 74 | 74 | $return = $wpdb->insert_id; |
| 75 | 75 | } else { |
| 76 | 76 | $return = new WP_Error( 'gravityview-add-note', $wpdb->last_error ); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public static function delete_notes( $note_ids = array() ) { |
| 98 | 98 | |
| 99 | - if( !is_array( $note_ids ) ) { |
|
| 99 | + if ( ! is_array( $note_ids ) ) { |
|
| 100 | 100 | |
| 101 | 101 | gravityview()->log->error( 'Note IDs not an array. Not processing delete request.', array( 'data' => $note_ids ) ); |
| 102 | 102 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | ) |
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | - return $results ? $results[0] : false; |
|
| 159 | + return $results ? $results[ 0 ] : false; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public static function filter_avatar( $avatar = '', $note ) { |
| 171 | 171 | |
| 172 | - if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
| 173 | - $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
| 172 | + if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
| 173 | + $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | return $avatar; |
@@ -10,6 +10,7 @@ discard block |
||
| 10 | 10 | * @internal |
| 11 | 11 | * @since 2.0 |
| 12 | 12 | * |
| 13 | + * @param \GravityView_View_Data $_this |
|
| 13 | 14 | * @return array|false The old array data, or false on error. |
| 14 | 15 | */ |
| 15 | 16 | function GravityView_View_Data_add_view( $view_id, $atts, $_this ) { |
@@ -62,6 +63,8 @@ discard block |
||
| 62 | 63 | * @internal |
| 63 | 64 | * @since 2.0 |
| 64 | 65 | * |
| 66 | + * @param integer $form_id |
|
| 67 | + * @param integer $count |
|
| 65 | 68 | * @return array The old associative array data as returned by |
| 66 | 69 | * \GravityView_frontend::get_view_entries(), the paging parameters |
| 67 | 70 | * and a total count of all entries. |
@@ -155,6 +158,7 @@ discard block |
||
| 155 | 158 | * @internal |
| 156 | 159 | * @since 2.0 |
| 157 | 160 | * |
| 161 | + * @param string $format |
|
| 158 | 162 | * @return null|string The value of a field in an entry. |
| 159 | 163 | */ |
| 160 | 164 | function GravityView_API_field_value( $entry, $field_settings, $format ) { |
@@ -102,8 +102,7 @@ discard block |
||
| 102 | 102 | $entries = $view->get_entries( gravityview()->request ); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 106 | - : ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 105 | + $page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 107 | 106 | |
| 108 | 107 | /** Set paging, count and unwrap the entries. */ |
| 109 | 108 | $paging = array( |
@@ -142,17 +141,17 @@ discard block |
||
| 142 | 141 | * @return null|string The value of a field in an entry. |
| 143 | 142 | */ |
| 144 | 143 | function GravityView_API_field_value( $entry, $field_settings, $format ) { |
| 145 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 144 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 146 | 145 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 147 | 146 | return null; |
| 148 | 147 | } |
| 149 | 148 | |
| 150 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 151 | - $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) ); |
|
| 152 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 149 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 150 | + $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) ); |
|
| 151 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 153 | 152 | } |
| 154 | 153 | |
| 155 | - if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 154 | + if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 156 | 155 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 157 | 156 | return null; |
| 158 | 157 | } |
@@ -162,18 +161,18 @@ discard block |
||
| 162 | 161 | * |
| 163 | 162 | * Fields with a numeric ID are Gravity Forms ones. |
| 164 | 163 | */ |
| 165 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;; |
|
| 164 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ; |
|
| 166 | 165 | |
| 167 | 166 | /** Initialize the future field. */ |
| 168 | 167 | switch ( $source ): |
| 169 | 168 | /** The Gravity Forms backend. */ |
| 170 | 169 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 171 | - if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 170 | + if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 172 | 171 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 173 | 172 | return null; |
| 174 | 173 | } |
| 175 | 174 | |
| 176 | - if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) { |
|
| 175 | + if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) { |
|
| 177 | 176 | return null; |
| 178 | 177 | } |
| 179 | 178 | |
@@ -181,7 +180,7 @@ discard block |
||
| 181 | 180 | |
| 182 | 181 | /** Our internal backend. */ |
| 183 | 182 | case \GV\Source::BACKEND_INTERNAL: |
| 184 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 183 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 185 | 184 | return null; |
| 186 | 185 | } |
| 187 | 186 | |
@@ -215,13 +214,13 @@ discard block |
||
| 215 | 214 | |
| 216 | 215 | /** A bail condition. */ |
| 217 | 216 | $bail = function( $label, $field_settings, $entry, $force_show_label, $form ) { |
| 218 | - if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) { |
|
| 217 | + if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) { |
|
| 219 | 218 | |
| 220 | - $label = isset( $field_settings['label'] ) ? $field_settings['label'] : ''; |
|
| 219 | + $label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : ''; |
|
| 221 | 220 | |
| 222 | 221 | // Use Gravity Forms label by default, but if a custom label is defined in GV, use it. |
| 223 | - if ( ! empty( $field_settings['custom_label'] ) ) { |
|
| 224 | - $label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry ); |
|
| 222 | + if ( ! empty( $field_settings[ 'custom_label' ] ) ) { |
|
| 223 | + $label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry ); |
|
| 225 | 224 | } |
| 226 | 225 | |
| 227 | 226 | /** |
@@ -247,19 +246,19 @@ discard block |
||
| 247 | 246 | |
| 248 | 247 | $label = ''; |
| 249 | 248 | |
| 250 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 251 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 252 | - if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) { |
|
| 249 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 250 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 251 | + if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) { |
|
| 253 | 252 | $form = $_form->form; |
| 254 | 253 | } |
| 255 | 254 | } |
| 256 | 255 | |
| 257 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 256 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 258 | 257 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 259 | 258 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 260 | 259 | } |
| 261 | 260 | |
| 262 | - if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 261 | + if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 263 | 262 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 264 | 263 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 265 | 264 | } |
@@ -271,31 +270,31 @@ discard block |
||
| 271 | 270 | * |
| 272 | 271 | * Fields with a numeric ID are Gravity Forms ones. |
| 273 | 272 | */ |
| 274 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 273 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 275 | 274 | |
| 276 | 275 | /** Initialize the future field. */ |
| 277 | 276 | switch ( $source ): |
| 278 | 277 | /** The Gravity Forms backend. */ |
| 279 | 278 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 280 | - if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 279 | + if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 281 | 280 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 282 | 281 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 283 | 282 | } |
| 284 | 283 | |
| 285 | - if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) { |
|
| 286 | - gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) ); |
|
| 284 | + if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) { |
|
| 285 | + gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) ); |
|
| 287 | 286 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form ); |
| 288 | 287 | } |
| 289 | - if ( empty( $field_settings['show_label'] ) ) { |
|
| 288 | + if ( empty( $field_settings[ 'show_label' ] ) ) { |
|
| 290 | 289 | /** The label never wins... */ |
| 291 | - $field_settings['label'] = ''; |
|
| 290 | + $field_settings[ 'label' ] = ''; |
|
| 292 | 291 | } |
| 293 | 292 | |
| 294 | 293 | break; |
| 295 | 294 | |
| 296 | 295 | /** Our internal backend. */ |
| 297 | 296 | case \GV\Source::BACKEND_INTERNAL: |
| 298 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 297 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 299 | 298 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 300 | 299 | } |
| 301 | 300 | break; |
@@ -307,8 +306,8 @@ discard block |
||
| 307 | 306 | break; |
| 308 | 307 | endswitch; |
| 309 | 308 | |
| 310 | - if( $force_show_label ) { |
|
| 311 | - $field_settings['show_label'] = '1'; |
|
| 309 | + if ( $force_show_label ) { |
|
| 310 | + $field_settings[ 'show_label' ] = '1'; |
|
| 312 | 311 | } |
| 313 | 312 | |
| 314 | 313 | /** Add the field settings. */ |
@@ -444,7 +443,7 @@ discard block |
||
| 444 | 443 | '\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(), |
| 445 | 444 | '\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(), |
| 446 | 445 | '\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(), |
| 447 | - 'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'], |
|
| 446 | + 'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ], |
|
| 448 | 447 | 'wp_query::in_the_loop' => $wp_query->in_the_loop, |
| 449 | 448 | ); |
| 450 | 449 | } |
@@ -532,7 +531,7 @@ discard block |
||
| 532 | 531 | break; |
| 533 | 532 | case 'wp_actions[loop_start]': |
| 534 | 533 | global $wp_actions; |
| 535 | - $wp_actions['loop_start'] = $value; |
|
| 534 | + $wp_actions[ 'loop_start' ] = $value; |
|
| 536 | 535 | break; |
| 537 | 536 | case 'wp_query::in_the_loop': |
| 538 | 537 | global $wp_query; |
@@ -629,9 +628,7 @@ discard block |
||
| 629 | 628 | case 'request': |
| 630 | 629 | self::thaw( array( |
| 631 | 630 | '\GravityView_View::context' => ( |
| 632 | - $value->is_entry() ? 'single' : |
|
| 633 | - ( $value->is_edit_entry() ? 'edit' : |
|
| 634 | - ( $value->is_view() ? 'directory': null ) |
|
| 631 | + $value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null ) |
|
| 635 | 632 | ) |
| 636 | 633 | ), |
| 637 | 634 | '\GravityView_frontend::is_search' => $value->is_search(), |
@@ -685,14 +682,14 @@ discard block |
||
| 685 | 682 | global $wp_query, $wp_actions; |
| 686 | 683 | |
| 687 | 684 | $wp_query->in_the_loop = false; |
| 688 | - $wp_actions['loop_start'] = 0; |
|
| 685 | + $wp_actions[ 'loop_start' ] = 0; |
|
| 689 | 686 | } |
| 690 | 687 | } |
| 691 | 688 | |
| 692 | 689 | |
| 693 | 690 | /** Add some global fix for field capability discrepancies. */ |
| 694 | 691 | add_filter( 'gravityview/configuration/fields', function( $fields ) { |
| 695 | - if ( empty( $fields ) ) { |
|
| 692 | + if ( empty( $fields ) ) { |
|
| 696 | 693 | return $fields; |
| 697 | 694 | } |
| 698 | 695 | |
@@ -719,11 +716,11 @@ discard block |
||
| 719 | 716 | } |
| 720 | 717 | |
| 721 | 718 | foreach ( $_fields as $uid => &$_field ) { |
| 722 | - if ( ! isset( $_field['only_loggedin'] ) ) { |
|
| 719 | + if ( ! isset( $_field[ 'only_loggedin' ] ) ) { |
|
| 723 | 720 | continue; |
| 724 | 721 | } |
| 725 | 722 | /** If we do not require login, we don't require a cap. */ |
| 726 | - $_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' ); |
|
| 723 | + $_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' ); |
|
| 727 | 724 | } |
| 728 | 725 | } |
| 729 | 726 | return $fields; |
@@ -754,8 +751,8 @@ discard block |
||
| 754 | 751 | } |
| 755 | 752 | |
| 756 | 753 | foreach ( $_fields as $uid => &$_field ) { |
| 757 | - if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) { |
|
| 758 | - $_field['form_id'] = $view->form->ID; |
|
| 754 | + if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) { |
|
| 755 | + $_field[ 'form_id' ] = $view->form->ID; |
|
| 759 | 756 | } |
| 760 | 757 | } |
| 761 | 758 | } |
@@ -769,13 +766,13 @@ discard block |
||
| 769 | 766 | if ( class_exists( '\GravityView_frontend' ) ) { |
| 770 | 767 | global $wp_filter; |
| 771 | 768 | |
| 772 | - if ( empty( $wp_filter['gravityview_after'] ) ) { |
|
| 769 | + if ( empty( $wp_filter[ 'gravityview_after' ] ) ) { |
|
| 773 | 770 | return; |
| 774 | 771 | } |
| 775 | 772 | |
| 776 | - foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) { |
|
| 773 | + foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) { |
|
| 777 | 774 | if ( strpos( $function_key, 'context_not_configured_warning' ) ) { |
| 778 | - unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] ); |
|
| 775 | + unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] ); |
|
| 779 | 776 | } |
| 780 | 777 | } |
| 781 | 778 | } |