@@ -62,6 +62,8 @@ |
||
| 62 | 62 | * @internal |
| 63 | 63 | * @since future |
| 64 | 64 | * |
| 65 | + * @param integer $form_id |
|
| 66 | + * @param integer $count |
|
| 65 | 67 | * @return array The old associative array data as returned by |
| 66 | 68 | * \GravityView_frontend::get_view_entries(), the paging parameters |
| 67 | 69 | * and a total count of all entries. |
@@ -94,14 +94,14 @@ discard block |
||
| 94 | 94 | $paging = rgar( $parameters, 'paging' ); |
| 95 | 95 | } else { |
| 96 | 96 | $entries = $form->entries |
| 97 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) ) |
|
| 98 | - ->offset( $args['offset'] ) |
|
| 99 | - ->limit( $criteria['paging']['page_size'] ) |
|
| 100 | - ->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 ); |
|
| 101 | - if ( ! empty( $criteria['sorting'] ) ) { |
|
| 97 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) ) |
|
| 98 | + ->offset( $args[ 'offset' ] ) |
|
| 99 | + ->limit( $criteria[ 'paging' ][ 'page_size' ] ) |
|
| 100 | + ->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 101 | + if ( ! empty( $criteria[ 'sorting' ] ) ) { |
|
| 102 | 102 | $field = new \GV\Field(); |
| 103 | - $field->ID = $criteria['sorting']['key']; |
|
| 104 | - $direction = strtolower( $criteria['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 103 | + $field->ID = $criteria[ 'sorting' ][ 'key' ]; |
|
| 104 | + $direction = strtolower( $criteria[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 105 | 105 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 106 | 106 | } |
| 107 | 107 | |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | /** Add some global fix for field capability discrepancies. */ |
| 129 | 129 | add_filter( 'gravityview/configuration/fields', function( $fields ) { |
| 130 | - if ( empty( $fields ) ) { |
|
| 130 | + if ( empty( $fields ) ) { |
|
| 131 | 131 | return $fields; |
| 132 | 132 | } |
| 133 | 133 | |
@@ -154,11 +154,11 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | foreach ( $_fields as $uid => &$_field ) { |
| 157 | - if ( ! isset( $_field['only_loggedin'] ) ) { |
|
| 157 | + if ( ! isset( $_field[ 'only_loggedin' ] ) ) { |
|
| 158 | 158 | continue; |
| 159 | 159 | } |
| 160 | 160 | /** If we do not require login, we don't require a cap. */ |
| 161 | - $_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' ); |
|
| 161 | + $_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' ); |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | return $fields; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public static function process_modifiers( $value, $merge_tag, $modifier, $field, $raw_value ) { |
| 46 | 46 | |
| 47 | 47 | // No modifier was set or the raw value was empty |
| 48 | - if( 'all_fields' === $merge_tag || '' === $modifier || ! is_string( $raw_value ) || '' === $raw_value ) { |
|
| 48 | + if ( 'all_fields' === $merge_tag || '' === $modifier || ! is_string( $raw_value ) || '' === $raw_value ) { |
|
| 49 | 49 | return $value; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | foreach ( $gv_modifiers as $gv_modifier => $method ) { |
| 62 | 62 | |
| 63 | 63 | // Only match the regex if it's the first modifer; this allows us to enforce our own modifier structure |
| 64 | - preg_match( '/^' . $gv_modifier .'/ism', $modifier, $matches ); |
|
| 64 | + preg_match( '/^' . $gv_modifier . '/ism', $modifier, $matches ); |
|
| 65 | 65 | |
| 66 | - if( ! empty( $matches ) ) { |
|
| 66 | + if ( ! empty( $matches ) ) { |
|
| 67 | 67 | // The called method is passed the raw value and the full matches array |
| 68 | 68 | $return = self::$method( $raw_value, $matches ); |
| 69 | 69 | break; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | private static function modifier_timestamp( $raw_value, $matches ) { |
| 89 | 89 | |
| 90 | - if( empty( $matches[0] ) ) { |
|
| 90 | + if ( empty( $matches[ 0 ] ) ) { |
|
| 91 | 91 | return $raw_value; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | private static function modifier_wpautop( $raw_value, $matches ) { |
| 113 | 113 | |
| 114 | - if( empty( $matches[0] ) || ! function_exists( 'wpautop' ) ) { |
|
| 114 | + if ( empty( $matches[ 0 ] ) || ! function_exists( 'wpautop' ) ) { |
|
| 115 | 115 | return $raw_value; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | private static function modifier_maxwords( $raw_value, $matches ) { |
| 137 | 137 | |
| 138 | - if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) { |
|
| 138 | + if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) { |
|
| 139 | 139 | return $raw_value; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - $max = intval( $matches[1] ); |
|
| 142 | + $max = intval( $matches[ 1 ] ); |
|
| 143 | 143 | |
| 144 | 144 | $more_placeholder = '[GVMORE]'; |
| 145 | 145 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | * @param bool $esc_html Pass return value through `esc_html()` |
| 172 | 172 | * @return string Text with variables maybe replaced |
| 173 | 173 | */ |
| 174 | - public static function replace_variables($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) { |
|
| 174 | + public static function replace_variables( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) { |
|
| 175 | 175 | |
| 176 | 176 | /** |
| 177 | 177 | * @filter `gravityview_do_replace_variables` Turn off merge tag variable replacements.\n |
@@ -196,9 +196,9 @@ discard block |
||
| 196 | 196 | * @internal Fixed $form['title'] in Gravity Forms |
| 197 | 197 | * @see https://github.com/gravityforms/gravityforms/pull/27/files |
| 198 | 198 | */ |
| 199 | - $form['title'] = isset( $form['title'] ) ? $form['title'] : ''; |
|
| 200 | - $form['id'] = isset( $form['id'] ) ? $form['id'] : ''; |
|
| 201 | - $form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array(); |
|
| 199 | + $form[ 'title' ] = isset( $form[ 'title' ] ) ? $form[ 'title' ] : ''; |
|
| 200 | + $form[ 'id' ] = isset( $form[ 'id' ] ) ? $form[ 'id' ] : ''; |
|
| 201 | + $form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array(); |
|
| 202 | 202 | |
| 203 | 203 | return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html ); |
| 204 | 204 | } |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @return mixed |
| 220 | 220 | */ |
| 221 | - public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
| 221 | + public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
| 222 | 222 | |
| 223 | 223 | /** |
| 224 | 224 | * This prevents the gform_replace_merge_tags filter from being called twice, as defined in: |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * @see GFCommon::replace_variables_prepopulate() |
| 227 | 227 | * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14 |
| 228 | 228 | */ |
| 229 | - if( false === $form ) { |
|
| 229 | + if ( false === $form ) { |
|
| 230 | 230 | return $text; |
| 231 | 231 | } |
| 232 | 232 | |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | 'diff' => in_array( 'diff', $exploded ), // {date_created:diff} |
| 259 | 259 | 'raw' => in_array( 'raw', $exploded ), // {date_created:raw} |
| 260 | 260 | 'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp} |
| 261 | - 'time' => in_array( 'time', $exploded ), // {date_created:time} |
|
| 261 | + 'time' => in_array( 'time', $exploded ), // {date_created:time} |
|
| 262 | 262 | ); |
| 263 | 263 | |
| 264 | 264 | $formatted_date = GVCommon::format_date( $date_created, $atts ); |
@@ -321,14 +321,14 @@ discard block |
||
| 321 | 321 | preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER ); |
| 322 | 322 | |
| 323 | 323 | // If there are no matches OR the Entry `created_by` isn't set or is 0 (no user) |
| 324 | - if( empty( $matches ) ) { |
|
| 324 | + if ( empty( $matches ) ) { |
|
| 325 | 325 | return $text; |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | foreach ( $matches as $match ) { |
| 329 | 329 | |
| 330 | - $full_tag = $match[0]; |
|
| 331 | - $property = $match[1]; |
|
| 330 | + $full_tag = $match[ 0 ]; |
|
| 331 | + $property = $match[ 1 ]; |
|
| 332 | 332 | |
| 333 | 333 | $value = stripslashes_deep( rgget( $property ) ); |
| 334 | 334 | |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * @since 1.15 |
| 353 | 353 | * @param bool $esc_html Whether to esc_html() the value. Default: `true` |
| 354 | 354 | */ |
| 355 | - $esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true ); |
|
| 355 | + $esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true ); |
|
| 356 | 356 | |
| 357 | 357 | $value = $esc_html ? esc_html( $value ) : $value; |
| 358 | 358 | |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | * @param[in] array $form Gravity Forms form array |
| 364 | 364 | * @param[in] array $entry Entry array |
| 365 | 365 | */ |
| 366 | - $value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry ); |
|
| 366 | + $value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry ); |
|
| 367 | 367 | |
| 368 | 368 | $text = str_replace( $full_tag, $value, $text ); |
| 369 | 369 | } |
@@ -56,16 +56,16 @@ discard block |
||
| 56 | 56 | public static function add() { |
| 57 | 57 | $shortcode = new static(); |
| 58 | 58 | if ( shortcode_exists( $shortcode->name ) ) { |
| 59 | - if ( empty( self::$shortcodes[$shortcode->name] ) ) { |
|
| 59 | + if ( empty( self::$shortcodes[ $shortcode->name ] ) ) { |
|
| 60 | 60 | gravityview()->log->error( 'Shortcode [{shortcode}] has already been registered elsewhere.', array( 'shortcode' => $shortcode->name ) ); |
| 61 | 61 | return null; |
| 62 | 62 | } |
| 63 | 63 | } else { |
| 64 | 64 | add_shortcode( $shortcode->name, array( get_class( $shortcode ), 'callback' ) ); |
| 65 | - self::$shortcodes[$shortcode->name] = $shortcode; |
|
| 65 | + self::$shortcodes[ $shortcode->name ] = $shortcode; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - return self::$shortcodes[$shortcode->name]; |
|
| 68 | + return self::$shortcodes[ $shortcode->name ]; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public static function remove() { |
| 79 | 79 | $shortcode = new static(); |
| 80 | - unset( self::$shortcodes[$shortcode->name] ); |
|
| 80 | + unset( self::$shortcodes[ $shortcode->name ] ); |
|
| 81 | 81 | remove_shortcode( $shortcode->name ); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); |
| 110 | 110 | |
| 111 | 111 | foreach ( $matches as $shortcode ) { |
| 112 | - $shortcode_name = $shortcode[2]; |
|
| 112 | + $shortcode_name = $shortcode[ 2 ]; |
|
| 113 | 113 | |
| 114 | - $shortcode_atts = shortcode_parse_atts( $shortcode[3] ); |
|
| 115 | - $shortcode_content = $shortcode[5]; |
|
| 114 | + $shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] ); |
|
| 115 | + $shortcode_content = $shortcode[ 5 ]; |
|
| 116 | 116 | |
| 117 | 117 | /** This is a registered GravityView shortcode. */ |
| 118 | - if ( !empty( self::$shortcodes[$shortcode_name] ) ) { |
|
| 119 | - $shortcode = clone self::$shortcodes[$shortcode_name]; |
|
| 118 | + if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) { |
|
| 119 | + $shortcode = clone self::$shortcodes[ $shortcode_name ]; |
|
| 120 | 120 | } else { |
| 121 | 121 | /** This is some generic shortcode. */ |
| 122 | 122 | $shortcode = new self; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $supports = array( 'title', 'revisions' ); |
| 87 | 87 | |
| 88 | 88 | if ( $is_hierarchical ) { |
| 89 | - $supports[] = 'page-attributes'; |
|
| 89 | + $supports[ ] = 'page-attributes'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if ( ! $view->form ) { |
| 198 | 198 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
| 199 | 199 | 'view_id' => $view->ID, |
| 200 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
| 200 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
| 201 | 201 | ) ); |
| 202 | 202 | } |
| 203 | 203 | |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | gravityview()->log->notice( 'This is a \GV\View object should not be accessed as an array.' ); |
| 337 | 337 | |
| 338 | - if ( ! isset( $this[$offset] ) ) { |
|
| 338 | + if ( ! isset( $this[ $offset ] ) ) { |
|
| 339 | 339 | return null; |
| 340 | 340 | } |
| 341 | 341 | |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | return $this->template ? $this->template->ID : null; |
| 354 | 354 | default: |
| 355 | 355 | /** @todo move the rest out and get rid of _data completely! */ |
| 356 | - return $this->_data[$offset]; |
|
| 356 | + return $this->_data[ $offset ]; |
|
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | array( 'form' => $this->form ? gravityview_get_form( $this->form->ID ) : null ), |
| 403 | 403 | array( 'atts' => $this->settings->as_atts() ), |
| 404 | 404 | array( 'fields' => $this->fields->by_visible()->as_configuration() ), |
| 405 | - array( 'template_id' => $this->template? $this->template->ID : null ), |
|
| 405 | + array( 'template_id' => $this->template ? $this->template->ID : null ), |
|
| 406 | 406 | $this->_data |
| 407 | 407 | ); |
| 408 | 408 | } |
@@ -202,8 +202,8 @@ discard block |
||
| 202 | 202 | * @return string The version of PHP. |
| 203 | 203 | */ |
| 204 | 204 | private function get_php_version() { |
| 205 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ? |
|
| 206 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
| 205 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ? |
|
| 206 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -214,8 +214,8 @@ discard block |
||
| 214 | 214 | * @return string The version of WordPress. |
| 215 | 215 | */ |
| 216 | 216 | private function get_wordpress_version() { |
| 217 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ? |
|
| 218 | - $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version']; |
|
| 217 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ? |
|
| 218 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ]; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
@@ -226,13 +226,13 @@ discard block |
||
| 226 | 226 | * @return string|null The version of Gravity Forms or null if inactive. |
| 227 | 227 | */ |
| 228 | 228 | private function get_gravityforms_version() { |
| 229 | - if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) { |
|
| 229 | + if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) { |
|
| 230 | 230 | gravityview()->log->error( 'Gravity Forms is inactive or not installed.' ); |
| 231 | 231 | return null; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ? |
|
| 235 | - $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version; |
|
| 234 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ? |
|
| 235 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version; |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | private function __clone() { } |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | function load() { |
| 107 | 107 | |
| 108 | 108 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 109 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 109 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 110 | 110 | |
| 111 | 111 | // Don't display an embedded form when editing an entry |
| 112 | 112 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
| 113 | 113 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
| 114 | 114 | |
| 115 | 115 | // Stop Gravity Forms processing what is ours! |
| 116 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
| 116 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
| 117 | 117 | |
| 118 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 118 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 119 | 119 | |
| 120 | 120 | add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
| 121 | 121 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 127 | 127 | |
| 128 | 128 | // Add fields expected by GFFormDisplay::validate() |
| 129 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 129 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 130 | 130 | |
| 131 | 131 | } |
| 132 | 132 | |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | * @return void |
| 142 | 142 | */ |
| 143 | 143 | public function prevent_render_form() { |
| 144 | - if( $this->is_edit_entry() ) { |
|
| 145 | - if( 'wp_head' === current_filter() ) { |
|
| 144 | + if ( $this->is_edit_entry() ) { |
|
| 145 | + if ( 'wp_head' === current_filter() ) { |
|
| 146 | 146 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 147 | 147 | } else { |
| 148 | 148 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -157,13 +157,13 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | public function prevent_maybe_process_form() { |
| 159 | 159 | |
| 160 | - if( ! empty( $_POST ) ) { |
|
| 160 | + if ( ! empty( $_POST ) ) { |
|
| 161 | 161 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - if( $this->is_edit_entry_submission() ) { |
|
| 165 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 166 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 164 | + if ( $this->is_edit_entry_submission() ) { |
|
| 165 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 166 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | public function is_edit_entry() { |
| 175 | 175 | |
| 176 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
| 176 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
| 177 | 177 | |
| 178 | 178 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 179 | 179 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @return boolean |
| 185 | 185 | */ |
| 186 | 186 | public function is_edit_entry_submission() { |
| 187 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 187 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
@@ -195,15 +195,15 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | |
| 197 | 197 | $entries = $gravityview_view->getEntries(); |
| 198 | - self::$original_entry = $entries[0]; |
|
| 199 | - $this->entry = $entries[0]; |
|
| 198 | + self::$original_entry = $entries[ 0 ]; |
|
| 199 | + $this->entry = $entries[ 0 ]; |
|
| 200 | 200 | |
| 201 | 201 | self::$original_form = $gravityview_view->getForm(); |
| 202 | 202 | $this->form = $gravityview_view->getForm(); |
| 203 | 203 | $this->form_id = $gravityview_view->getFormId(); |
| 204 | 204 | $this->view_id = $gravityview_view->getViewId(); |
| 205 | 205 | |
| 206 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 206 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | |
@@ -224,14 +224,14 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | // Multiple Views embedded, don't proceed if nonce fails |
| 226 | 226 | $multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views(); |
| 227 | - if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) { |
|
| 228 | - do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
| 227 | + if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) { |
|
| 228 | + do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
| 229 | 229 | return; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | // Sorry, you're not allowed here. |
| 233 | - if( false === $this->user_can_edit_entry( true ) ) { |
|
| 234 | - do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
| 233 | + if ( false === $this->user_can_edit_entry( true ) ) { |
|
| 234 | + do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
| 235 | 235 | return; |
| 236 | 236 | } |
| 237 | 237 | |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | private function print_scripts() { |
| 252 | 252 | $gravityview_view = GravityView_View::getInstance(); |
| 253 | 253 | |
| 254 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 254 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 255 | 255 | |
| 256 | - GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false); |
|
| 256 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 257 | 257 | |
| 258 | 258 | // Sack is required for images |
| 259 | 259 | wp_print_scripts( array( 'sack', 'gform_gravityforms' ) ); |
@@ -265,32 +265,32 @@ discard block |
||
| 265 | 265 | */ |
| 266 | 266 | private function process_save() { |
| 267 | 267 | |
| 268 | - if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 268 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 269 | 269 | return; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | // Make sure the entry, view, and form IDs are all correct |
| 273 | 273 | $valid = $this->verify_nonce(); |
| 274 | 274 | |
| 275 | - if( !$valid ) { |
|
| 276 | - do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
| 275 | + if ( ! $valid ) { |
|
| 276 | + do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
| 277 | 277 | return; |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - if( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 281 | - do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
| 280 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 281 | + do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
| 282 | 282 | return; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 285 | + do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 286 | 286 | |
| 287 | 287 | $this->process_save_process_files( $this->form_id ); |
| 288 | 288 | |
| 289 | 289 | $this->validate(); |
| 290 | 290 | |
| 291 | - if( $this->is_valid ) { |
|
| 291 | + if ( $this->is_valid ) { |
|
| 292 | 292 | |
| 293 | - do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
| 293 | + do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
| 294 | 294 | |
| 295 | 295 | /** |
| 296 | 296 | * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields |
@@ -300,22 +300,22 @@ discard block |
||
| 300 | 300 | /** |
| 301 | 301 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 302 | 302 | */ |
| 303 | - unset( $_GET['page'] ); |
|
| 303 | + unset( $_GET[ 'page' ] ); |
|
| 304 | 304 | |
| 305 | - $date_created = $this->entry['date_created']; |
|
| 305 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | 308 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 309 | 309 | * @since 1.17.2 |
| 310 | 310 | */ |
| 311 | - unset( $this->entry['date_created'] ); |
|
| 311 | + unset( $this->entry[ 'date_created' ] ); |
|
| 312 | 312 | |
| 313 | 313 | GFFormsModel::save_lead( $form, $this->entry ); |
| 314 | 314 | |
| 315 | 315 | // Delete the values for hidden inputs |
| 316 | 316 | $this->unset_hidden_field_values(); |
| 317 | 317 | |
| 318 | - $this->entry['date_created'] = $date_created; |
|
| 318 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 319 | 319 | |
| 320 | 320 | // Process calculation fields |
| 321 | 321 | $this->update_calculation_fields(); |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | * @param string $entry_id Numeric ID of the entry that was updated |
| 336 | 336 | * @param GravityView_Edit_Entry_Render $this This object |
| 337 | 337 | */ |
| 338 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this ); |
|
| 338 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this ); |
|
| 339 | 339 | |
| 340 | 340 | } else { |
| 341 | - do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
| 341 | + do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | } // process_save |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | private function unset_hidden_field_values() { |
| 356 | 356 | global $wpdb; |
| 357 | 357 | |
| 358 | - $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
| 359 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 358 | + $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
| 359 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 360 | 360 | |
| 361 | 361 | foreach ( $this->entry as $input_id => $field_value ) { |
| 362 | 362 | |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | /** No file is being uploaded. */ |
| 439 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 439 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 440 | 440 | /** So return the original upload */ |
| 441 | 441 | return $entry[ $input_id ]; |
| 442 | 442 | } |
@@ -454,11 +454,11 @@ discard block |
||
| 454 | 454 | * @return mixed |
| 455 | 455 | */ |
| 456 | 456 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 457 | - if( ! $this->is_edit_entry() ) { |
|
| 457 | + if ( ! $this->is_edit_entry() ) { |
|
| 458 | 458 | return $plupload_init; |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 461 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 462 | 462 | |
| 463 | 463 | return $plupload_init; |
| 464 | 464 | } |
@@ -473,22 +473,22 @@ discard block |
||
| 473 | 473 | $form = $this->form; |
| 474 | 474 | |
| 475 | 475 | /** @var GF_Field $field */ |
| 476 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 476 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 477 | 477 | |
| 478 | 478 | /** |
| 479 | 479 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 480 | 480 | * @since 1.16.3 |
| 481 | 481 | * @var GF_Field $field |
| 482 | 482 | */ |
| 483 | - if( $field->has_calculation() ) { |
|
| 484 | - unset( $form['fields'][ $k ] ); |
|
| 483 | + if ( $field->has_calculation() ) { |
|
| 484 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | $field->adminOnly = false; |
| 488 | 488 | |
| 489 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 490 | - foreach( $field->inputs as $key => $input ) { |
|
| 491 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 489 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 490 | + foreach ( $field->inputs as $key => $input ) { |
|
| 491 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 492 | 492 | } |
| 493 | 493 | } |
| 494 | 494 | } |
@@ -502,30 +502,30 @@ discard block |
||
| 502 | 502 | $update = false; |
| 503 | 503 | |
| 504 | 504 | // get the most up to date entry values |
| 505 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 505 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 506 | 506 | |
| 507 | - if( !empty( $this->fields_with_calculation ) ) { |
|
| 507 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
| 508 | 508 | $update = true; |
| 509 | 509 | foreach ( $this->fields_with_calculation as $calc_field ) { |
| 510 | 510 | $inputs = $calc_field->get_entry_inputs(); |
| 511 | 511 | if ( is_array( $inputs ) ) { |
| 512 | 512 | foreach ( $inputs as $input ) { |
| 513 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 514 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 513 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 514 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 515 | 515 | } |
| 516 | 516 | } else { |
| 517 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
| 518 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 517 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
| 518 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | - if( $update ) { |
|
| 524 | + if ( $update ) { |
|
| 525 | 525 | |
| 526 | 526 | $return_entry = GFAPI::update_entry( $entry ); |
| 527 | 527 | |
| 528 | - if( is_wp_error( $return_entry ) ) { |
|
| 528 | + if ( is_wp_error( $return_entry ) ) { |
|
| 529 | 529 | do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry ); |
| 530 | 530 | } else { |
| 531 | 531 | do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' ); |
@@ -556,18 +556,18 @@ discard block |
||
| 556 | 556 | |
| 557 | 557 | $input_name = 'input_' . $field_id; |
| 558 | 558 | |
| 559 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 559 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 560 | 560 | |
| 561 | 561 | // We have a new image |
| 562 | 562 | |
| 563 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 563 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 564 | 564 | |
| 565 | 565 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 566 | 566 | $img_url = rgar( $ary, 0 ); |
| 567 | 567 | |
| 568 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 569 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 570 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 568 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 569 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 570 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 571 | 571 | |
| 572 | 572 | $image_meta = array( |
| 573 | 573 | 'post_excerpt' => $img_caption, |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | |
| 577 | 577 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 578 | 578 | if ( ! empty( $img_title ) ) { |
| 579 | - $image_meta['post_title'] = $img_title; |
|
| 579 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | /** |
@@ -591,13 +591,13 @@ discard block |
||
| 591 | 591 | set_post_thumbnail( $post_id, $media_id ); |
| 592 | 592 | } |
| 593 | 593 | |
| 594 | - } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
| 594 | + } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
| 595 | 595 | |
| 596 | 596 | $img_url = $_POST[ $input_name ]; |
| 597 | 597 | |
| 598 | - $img_title = rgar( $_POST, $input_name.'_1' ); |
|
| 599 | - $img_caption = rgar( $_POST, $input_name .'_4' ); |
|
| 600 | - $img_description = rgar( $_POST, $input_name .'_7' ); |
|
| 598 | + $img_title = rgar( $_POST, $input_name . '_1' ); |
|
| 599 | + $img_caption = rgar( $_POST, $input_name . '_4' ); |
|
| 600 | + $img_description = rgar( $_POST, $input_name . '_7' ); |
|
| 601 | 601 | |
| 602 | 602 | $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : ''; |
| 603 | 603 | |
@@ -635,16 +635,16 @@ discard block |
||
| 635 | 635 | */ |
| 636 | 636 | private function maybe_update_post_fields( $form ) { |
| 637 | 637 | |
| 638 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 638 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 639 | 639 | do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' ); |
| 640 | 640 | return; |
| 641 | 641 | } |
| 642 | 642 | |
| 643 | - $post_id = $this->entry['post_id']; |
|
| 643 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 644 | 644 | |
| 645 | 645 | // Security check |
| 646 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 647 | - do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id ); |
|
| 646 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 647 | + do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id ); |
|
| 648 | 648 | return; |
| 649 | 649 | } |
| 650 | 650 | |
@@ -656,25 +656,25 @@ discard block |
||
| 656 | 656 | |
| 657 | 657 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 658 | 658 | |
| 659 | - if( ! $field ) { |
|
| 659 | + if ( ! $field ) { |
|
| 660 | 660 | continue; |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 663 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 664 | 664 | |
| 665 | 665 | // Get the value of the field, including $_POSTed value |
| 666 | 666 | $value = RGFormsModel::get_field_value( $field ); |
| 667 | 667 | |
| 668 | 668 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 669 | 669 | $entry_tmp = $this->entry; |
| 670 | - $entry_tmp["{$field_id}"] = $value; |
|
| 670 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 671 | 671 | |
| 672 | - switch( $field->type ) { |
|
| 672 | + switch ( $field->type ) { |
|
| 673 | 673 | |
| 674 | 674 | case 'post_title': |
| 675 | 675 | $post_title = $value; |
| 676 | - if( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 677 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 676 | + if ( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 677 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 678 | 678 | } |
| 679 | 679 | $updated_post->post_title = $post_title; |
| 680 | 680 | $updated_post->post_name = $post_title; |
@@ -683,8 +683,8 @@ discard block |
||
| 683 | 683 | |
| 684 | 684 | case 'post_content': |
| 685 | 685 | $post_content = $value; |
| 686 | - if( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
| 687 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 686 | + if ( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
| 687 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 688 | 688 | } |
| 689 | 689 | $updated_post->post_content = $post_content; |
| 690 | 690 | unset( $post_content ); |
@@ -698,12 +698,12 @@ discard block |
||
| 698 | 698 | case 'post_category': |
| 699 | 699 | break; |
| 700 | 700 | case 'post_custom_field': |
| 701 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 701 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 702 | 702 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
| 706 | - $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value ); |
|
| 706 | + $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value ); |
|
| 707 | 707 | } |
| 708 | 708 | |
| 709 | 709 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | // update entry after |
| 719 | - $this->entry["{$field_id}"] = $value; |
|
| 719 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 720 | 720 | |
| 721 | 721 | $update_entry = true; |
| 722 | 722 | |
@@ -725,25 +725,25 @@ discard block |
||
| 725 | 725 | |
| 726 | 726 | } |
| 727 | 727 | |
| 728 | - if( $update_entry ) { |
|
| 728 | + if ( $update_entry ) { |
|
| 729 | 729 | |
| 730 | 730 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 731 | 731 | |
| 732 | - if( is_wp_error( $return_entry ) ) { |
|
| 732 | + if ( is_wp_error( $return_entry ) ) { |
|
| 733 | 733 | do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ); |
| 734 | 734 | } else { |
| 735 | - do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' ); |
|
| 735 | + do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' ); |
|
| 736 | 736 | } |
| 737 | 737 | |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | 740 | $return_post = wp_update_post( $updated_post, true ); |
| 741 | 741 | |
| 742 | - if( is_wp_error( $return_post ) ) { |
|
| 742 | + if ( is_wp_error( $return_post ) ) { |
|
| 743 | 743 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 744 | 744 | do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) ); |
| 745 | 745 | } else { |
| 746 | - do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post ); |
|
| 746 | + do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post ); |
|
| 747 | 747 | } |
| 748 | 748 | } |
| 749 | 749 | |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | $input_type = RGFormsModel::get_input_type( $field ); |
| 762 | 762 | |
| 763 | 763 | // Only certain custom field types are supported |
| 764 | - switch( $input_type ) { |
|
| 764 | + switch ( $input_type ) { |
|
| 765 | 765 | case 'fileupload': |
| 766 | 766 | case 'list': |
| 767 | 767 | case 'multiselect': |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 799 | 799 | |
| 800 | 800 | // replace conditional shortcodes |
| 801 | - if( $do_shortcode ) { |
|
| 801 | + if ( $do_shortcode ) { |
|
| 802 | 802 | $output = do_shortcode( $output ); |
| 803 | 803 | } |
| 804 | 804 | |
@@ -817,18 +817,18 @@ discard block |
||
| 817 | 817 | */ |
| 818 | 818 | private function after_update() { |
| 819 | 819 | |
| 820 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
| 821 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
| 820 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 821 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 822 | 822 | |
| 823 | 823 | // Re-define the entry now that we've updated it. |
| 824 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 824 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 825 | 825 | |
| 826 | 826 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
| 827 | 827 | |
| 828 | 828 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 829 | 829 | // we have just updated. |
| 830 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 831 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 830 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 831 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 832 | 832 | } |
| 833 | 833 | |
| 834 | 834 | $this->entry = $entry; |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | |
| 847 | 847 | <div class="gv-edit-entry-wrapper"><?php |
| 848 | 848 | |
| 849 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 849 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 850 | 850 | |
| 851 | 851 | /** |
| 852 | 852 | * Fixes weird wpautop() issue |
@@ -862,7 +862,7 @@ discard block |
||
| 862 | 862 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 863 | 863 | * @param GravityView_Edit_Entry_Render $this This object |
| 864 | 864 | */ |
| 865 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 865 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 866 | 866 | |
| 867 | 867 | echo esc_attr( $edit_entry_title ); |
| 868 | 868 | ?></span> |
@@ -908,20 +908,20 @@ discard block |
||
| 908 | 908 | */ |
| 909 | 909 | private function maybe_print_message() { |
| 910 | 910 | |
| 911 | - if( rgpost('action') === 'update' ) { |
|
| 911 | + if ( rgpost( 'action' ) === 'update' ) { |
|
| 912 | 912 | |
| 913 | 913 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
| 914 | 914 | |
| 915 | - if( ! $this->is_valid ){ |
|
| 915 | + if ( ! $this->is_valid ) { |
|
| 916 | 916 | |
| 917 | 917 | // Keeping this compatible with Gravity Forms. |
| 918 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 919 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 918 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 919 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 920 | 920 | |
| 921 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 921 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 922 | 922 | |
| 923 | 923 | } else { |
| 924 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
| 924 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
| 925 | 925 | |
| 926 | 926 | /** |
| 927 | 927 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | * @param array $entry Gravity Forms entry array |
| 932 | 932 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 933 | 933 | */ |
| 934 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 934 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 935 | 935 | |
| 936 | 936 | echo GVCommon::generate_notice( $message ); |
| 937 | 937 | } |
@@ -955,21 +955,21 @@ discard block |
||
| 955 | 955 | */ |
| 956 | 956 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 957 | 957 | |
| 958 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 959 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 958 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 959 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 960 | 960 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
| 961 | 961 | |
| 962 | 962 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
| 963 | 963 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 964 | 964 | |
| 965 | 965 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 966 | - unset( $_GET['page'] ); |
|
| 966 | + unset( $_GET[ 'page' ] ); |
|
| 967 | 967 | |
| 968 | 968 | // TODO: Verify multiple-page forms |
| 969 | 969 | |
| 970 | 970 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 971 | 971 | |
| 972 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 972 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 973 | 973 | |
| 974 | 974 | ob_get_clean(); |
| 975 | 975 | |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | * @return string |
| 996 | 996 | */ |
| 997 | 997 | public function render_form_buttons() { |
| 998 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 998 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | |
@@ -1015,10 +1015,10 @@ discard block |
||
| 1015 | 1015 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1016 | 1016 | |
| 1017 | 1017 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1018 | - if( isset( $this->form_after_validation ) ) { |
|
| 1018 | + if ( isset( $this->form_after_validation ) ) { |
|
| 1019 | 1019 | $form = $this->form_after_validation; |
| 1020 | 1020 | } else { |
| 1021 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1021 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | $form = $this->filter_conditional_logic( $form ); |
@@ -1026,8 +1026,8 @@ discard block |
||
| 1026 | 1026 | $form = $this->prefill_conditional_logic( $form ); |
| 1027 | 1027 | |
| 1028 | 1028 | // for now we don't support Save and Continue feature. |
| 1029 | - if( ! self::$supports_save_and_continue ) { |
|
| 1030 | - unset( $form['save'] ); |
|
| 1029 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1030 | + unset( $form[ 'save' ] ); |
|
| 1031 | 1031 | } |
| 1032 | 1032 | |
| 1033 | 1033 | return $form; |
@@ -1048,29 +1048,29 @@ discard block |
||
| 1048 | 1048 | */ |
| 1049 | 1049 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1050 | 1050 | |
| 1051 | - if( GFCommon::is_post_field( $field ) ) { |
|
| 1051 | + if ( GFCommon::is_post_field( $field ) ) { |
|
| 1052 | 1052 | |
| 1053 | 1053 | $message = null; |
| 1054 | 1054 | |
| 1055 | 1055 | // First, make sure they have the capability to edit the post. |
| 1056 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1056 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1057 | 1057 | |
| 1058 | 1058 | /** |
| 1059 | 1059 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1060 | 1060 | * @param string $message The existing "You don't have permission..." text |
| 1061 | 1061 | */ |
| 1062 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1062 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1063 | 1063 | |
| 1064 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1064 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1065 | 1065 | /** |
| 1066 | 1066 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1067 | 1067 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1068 | 1068 | */ |
| 1069 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1069 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | - if( $message ) { |
|
| 1073 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1072 | + if ( $message ) { |
|
| 1073 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1074 | 1074 | } |
| 1075 | 1075 | } |
| 1076 | 1076 | |
@@ -1095,8 +1095,8 @@ discard block |
||
| 1095 | 1095 | |
| 1096 | 1096 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1097 | 1097 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1098 | - if( |
|
| 1099 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1098 | + if ( |
|
| 1099 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1100 | 1100 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1101 | 1101 | && ! GFCommon::is_product_field( $field->type ) |
| 1102 | 1102 | || ! empty( $field_content ) |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | $return = null; |
| 1117 | 1117 | |
| 1118 | 1118 | /** @var GravityView_Field $gv_field */ |
| 1119 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1119 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1120 | 1120 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1121 | 1121 | } else { |
| 1122 | 1122 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | // If there was output, it's an error |
| 1126 | 1126 | $warnings = ob_get_clean(); |
| 1127 | 1127 | |
| 1128 | - if( !empty( $warnings ) ) { |
|
| 1128 | + if ( ! empty( $warnings ) ) { |
|
| 1129 | 1129 | do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value ); |
| 1130 | 1130 | } |
| 1131 | 1131 | |
@@ -1150,7 +1150,7 @@ discard block |
||
| 1150 | 1150 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1151 | 1151 | |
| 1152 | 1152 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1153 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1153 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1154 | 1154 | |
| 1155 | 1155 | $field_value = array(); |
| 1156 | 1156 | |
@@ -1159,10 +1159,10 @@ discard block |
||
| 1159 | 1159 | |
| 1160 | 1160 | foreach ( (array)$field->inputs as $input ) { |
| 1161 | 1161 | |
| 1162 | - $input_id = strval( $input['id'] ); |
|
| 1162 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1163 | 1163 | |
| 1164 | 1164 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1165 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1165 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1166 | 1166 | $allow_pre_populated = false; |
| 1167 | 1167 | } |
| 1168 | 1168 | |
@@ -1170,7 +1170,7 @@ discard block |
||
| 1170 | 1170 | |
| 1171 | 1171 | $pre_value = $field->get_value_submission( array(), false ); |
| 1172 | 1172 | |
| 1173 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1173 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1174 | 1174 | |
| 1175 | 1175 | } else { |
| 1176 | 1176 | |
@@ -1181,13 +1181,13 @@ discard block |
||
| 1181 | 1181 | |
| 1182 | 1182 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1183 | 1183 | // or pre-populated value if not empty and set to override saved value |
| 1184 | - $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1184 | + $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1185 | 1185 | |
| 1186 | 1186 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1187 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1187 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1188 | 1188 | $categories = array(); |
| 1189 | 1189 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1190 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1190 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1191 | 1191 | } |
| 1192 | 1192 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1193 | 1193 | } |
@@ -1215,7 +1215,7 @@ discard block |
||
| 1215 | 1215 | * @param GF_Field $field Gravity Forms field object |
| 1216 | 1216 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1217 | 1217 | */ |
| 1218 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1218 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1219 | 1219 | |
| 1220 | 1220 | return $field_value; |
| 1221 | 1221 | } |
@@ -1232,12 +1232,12 @@ discard block |
||
| 1232 | 1232 | */ |
| 1233 | 1233 | public function gform_pre_validation( $form ) { |
| 1234 | 1234 | |
| 1235 | - if( ! $this->verify_nonce() ) { |
|
| 1235 | + if ( ! $this->verify_nonce() ) { |
|
| 1236 | 1236 | return $form; |
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | 1239 | // Fix PHP warning regarding undefined index. |
| 1240 | - foreach ( $form['fields'] as &$field) { |
|
| 1240 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1241 | 1241 | |
| 1242 | 1242 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1243 | 1243 | // expects certain field array items to be set. |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1246 | 1246 | } |
| 1247 | 1247 | |
| 1248 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1248 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1249 | 1249 | |
| 1250 | 1250 | /** |
| 1251 | 1251 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1259,37 +1259,37 @@ discard block |
||
| 1259 | 1259 | // Set the previous value |
| 1260 | 1260 | $entry = $this->get_entry(); |
| 1261 | 1261 | |
| 1262 | - $input_name = 'input_'.$field->id; |
|
| 1263 | - $form_id = $form['id']; |
|
| 1262 | + $input_name = 'input_' . $field->id; |
|
| 1263 | + $form_id = $form[ 'id' ]; |
|
| 1264 | 1264 | |
| 1265 | 1265 | $value = NULL; |
| 1266 | 1266 | |
| 1267 | 1267 | // Use the previous entry value as the default. |
| 1268 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1268 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1269 | 1269 | $value = $entry[ $field->id ]; |
| 1270 | 1270 | } |
| 1271 | 1271 | |
| 1272 | 1272 | // If this is a single upload file |
| 1273 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1274 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1275 | - $value = $file_path['url']; |
|
| 1273 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1274 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1275 | + $value = $file_path[ 'url' ]; |
|
| 1276 | 1276 | |
| 1277 | 1277 | } else { |
| 1278 | 1278 | |
| 1279 | 1279 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1280 | 1280 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1281 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1281 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1282 | 1282 | |
| 1283 | 1283 | } |
| 1284 | 1284 | |
| 1285 | - if( rgar($field, "multipleFiles") ) { |
|
| 1285 | + if ( rgar( $field, "multipleFiles" ) ) { |
|
| 1286 | 1286 | |
| 1287 | 1287 | // If there are fresh uploads, process and merge them. |
| 1288 | 1288 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1289 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1289 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1290 | 1290 | $value = empty( $value ) ? '[]' : $value; |
| 1291 | 1291 | $value = stripslashes_deep( $value ); |
| 1292 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1292 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1293 | 1293 | } |
| 1294 | 1294 | |
| 1295 | 1295 | } else { |
@@ -1307,8 +1307,8 @@ discard block |
||
| 1307 | 1307 | |
| 1308 | 1308 | case 'number': |
| 1309 | 1309 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1310 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1311 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1310 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1311 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1312 | 1312 | } |
| 1313 | 1313 | break; |
| 1314 | 1314 | } |
@@ -1345,7 +1345,7 @@ discard block |
||
| 1345 | 1345 | * You can enter whatever you want! |
| 1346 | 1346 | * We try validating, and customize the results using `self::custom_validation()` |
| 1347 | 1347 | */ |
| 1348 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1348 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1349 | 1349 | |
| 1350 | 1350 | // Needed by the validate funtion |
| 1351 | 1351 | $failed_validation_page = NULL; |
@@ -1353,14 +1353,14 @@ discard block |
||
| 1353 | 1353 | |
| 1354 | 1354 | // Prevent entry limit from running when editing an entry, also |
| 1355 | 1355 | // prevent form scheduling from preventing editing |
| 1356 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1356 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1357 | 1357 | |
| 1358 | 1358 | // Hide fields depending on Edit Entry settings |
| 1359 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1359 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1360 | 1360 | |
| 1361 | 1361 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1362 | 1362 | |
| 1363 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1363 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1364 | 1364 | } |
| 1365 | 1365 | |
| 1366 | 1366 | |
@@ -1377,13 +1377,13 @@ discard block |
||
| 1377 | 1377 | */ |
| 1378 | 1378 | public function custom_validation( $validation_results ) { |
| 1379 | 1379 | |
| 1380 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
| 1380 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
| 1381 | 1381 | |
| 1382 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 1382 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 1383 | 1383 | |
| 1384 | 1384 | $gv_valid = true; |
| 1385 | 1385 | |
| 1386 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1386 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1387 | 1387 | |
| 1388 | 1388 | $value = RGFormsModel::get_field_value( $field ); |
| 1389 | 1389 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1396,35 +1396,35 @@ discard block |
||
| 1396 | 1396 | case 'post_image': |
| 1397 | 1397 | |
| 1398 | 1398 | // in case nothing is uploaded but there are already files saved |
| 1399 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1399 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1400 | 1400 | $field->failed_validation = false; |
| 1401 | 1401 | unset( $field->validation_message ); |
| 1402 | 1402 | } |
| 1403 | 1403 | |
| 1404 | 1404 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1405 | - if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) { |
|
| 1405 | + if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) { |
|
| 1406 | 1406 | |
| 1407 | 1407 | $input_name = 'input_' . $field->id; |
| 1408 | 1408 | //uploaded |
| 1409 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1409 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1410 | 1410 | |
| 1411 | 1411 | //existent |
| 1412 | 1412 | $entry = $this->get_entry(); |
| 1413 | 1413 | $value = NULL; |
| 1414 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1414 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1415 | 1415 | $value = json_decode( $entry[ $field->id ], true ); |
| 1416 | 1416 | } |
| 1417 | 1417 | |
| 1418 | 1418 | // count uploaded files and existent entry files |
| 1419 | 1419 | $count_files = count( $file_names ) + count( $value ); |
| 1420 | 1420 | |
| 1421 | - if( $count_files > $field->maxFiles ) { |
|
| 1421 | + if ( $count_files > $field->maxFiles ) { |
|
| 1422 | 1422 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1423 | 1423 | $field->failed_validation = 1; |
| 1424 | 1424 | $gv_valid = false; |
| 1425 | 1425 | |
| 1426 | 1426 | // in case of error make sure the newest upload files are removed from the upload input |
| 1427 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1427 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | } |
@@ -1435,7 +1435,7 @@ discard block |
||
| 1435 | 1435 | } |
| 1436 | 1436 | |
| 1437 | 1437 | // This field has failed validation. |
| 1438 | - if( !empty( $field->failed_validation ) ) { |
|
| 1438 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1439 | 1439 | |
| 1440 | 1440 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) ); |
| 1441 | 1441 | |
@@ -1453,32 +1453,32 @@ discard block |
||
| 1453 | 1453 | } |
| 1454 | 1454 | |
| 1455 | 1455 | // You can't continue inside a switch, so we do it after. |
| 1456 | - if( empty( $field->failed_validation ) ) { |
|
| 1456 | + if ( empty( $field->failed_validation ) ) { |
|
| 1457 | 1457 | continue; |
| 1458 | 1458 | } |
| 1459 | 1459 | |
| 1460 | 1460 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1461 | 1461 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1462 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1462 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1463 | 1463 | |
| 1464 | 1464 | $entry = $this->get_entry(); |
| 1465 | 1465 | |
| 1466 | 1466 | // If the value of the entry is the same as the stored value |
| 1467 | 1467 | // Then we can assume it's not a duplicate, it's the same. |
| 1468 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1468 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1469 | 1469 | //if value submitted was not changed, then don't validate |
| 1470 | 1470 | $field->failed_validation = false; |
| 1471 | 1471 | |
| 1472 | 1472 | unset( $field->validation_message ); |
| 1473 | 1473 | |
| 1474 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
| 1474 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
| 1475 | 1475 | |
| 1476 | 1476 | continue; |
| 1477 | 1477 | } |
| 1478 | 1478 | } |
| 1479 | 1479 | |
| 1480 | 1480 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1481 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1481 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1482 | 1482 | unset( $field->validation_message ); |
| 1483 | 1483 | $field->validation_message = false; |
| 1484 | 1484 | continue; |
@@ -1490,12 +1490,12 @@ discard block |
||
| 1490 | 1490 | |
| 1491 | 1491 | } |
| 1492 | 1492 | |
| 1493 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1493 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1494 | 1494 | |
| 1495 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
| 1495 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
| 1496 | 1496 | |
| 1497 | 1497 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1498 | - $this->form_after_validation = $validation_results['form']; |
|
| 1498 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1499 | 1499 | |
| 1500 | 1500 | return $validation_results; |
| 1501 | 1501 | } |
@@ -1508,7 +1508,7 @@ discard block |
||
| 1508 | 1508 | */ |
| 1509 | 1509 | public function get_entry() { |
| 1510 | 1510 | |
| 1511 | - if( empty( $this->entry ) ) { |
|
| 1511 | + if ( empty( $this->entry ) ) { |
|
| 1512 | 1512 | // Get the database value of the entry that's being edited |
| 1513 | 1513 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1514 | 1514 | } |
@@ -1543,10 +1543,10 @@ discard block |
||
| 1543 | 1543 | } |
| 1544 | 1544 | |
| 1545 | 1545 | // If edit tab not yet configured, show all fields |
| 1546 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1546 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1547 | 1547 | |
| 1548 | 1548 | // Hide fields depending on admin settings |
| 1549 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1549 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1550 | 1550 | |
| 1551 | 1551 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1552 | 1552 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1578,7 +1578,7 @@ discard block |
||
| 1578 | 1578 | */ |
| 1579 | 1579 | private function filter_fields( $fields, $configured_fields ) { |
| 1580 | 1580 | |
| 1581 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1581 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1582 | 1582 | return $fields; |
| 1583 | 1583 | } |
| 1584 | 1584 | |
@@ -1591,18 +1591,18 @@ discard block |
||
| 1591 | 1591 | |
| 1592 | 1592 | // Remove the fields that have calculation properties and keep them to be used later |
| 1593 | 1593 | // @since 1.16.2 |
| 1594 | - if( $field->has_calculation() ) { |
|
| 1595 | - $this->fields_with_calculation[] = $field; |
|
| 1594 | + if ( $field->has_calculation() ) { |
|
| 1595 | + $this->fields_with_calculation[ ] = $field; |
|
| 1596 | 1596 | // don't remove the calculation fields on form render. |
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1599 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1600 | 1600 | unset( $fields[ $key ] ); |
| 1601 | 1601 | } |
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | 1604 | // The Edit tab has not been configured, so we return all fields by default. |
| 1605 | - if( empty( $configured_fields ) ) { |
|
| 1605 | + if ( empty( $configured_fields ) ) { |
|
| 1606 | 1606 | return $fields; |
| 1607 | 1607 | } |
| 1608 | 1608 | |
@@ -1612,8 +1612,8 @@ discard block |
||
| 1612 | 1612 | /** @var GF_Field $field */ |
| 1613 | 1613 | foreach ( $fields as $field ) { |
| 1614 | 1614 | |
| 1615 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1616 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1615 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1616 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1617 | 1617 | break; |
| 1618 | 1618 | } |
| 1619 | 1619 | |
@@ -1636,14 +1636,14 @@ discard block |
||
| 1636 | 1636 | |
| 1637 | 1637 | $return_field = $field; |
| 1638 | 1638 | |
| 1639 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 1639 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 1640 | 1640 | $return_field->label = ''; |
| 1641 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 1642 | - $return_field->label = $field_setting['custom_label']; |
|
| 1641 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 1642 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 1643 | 1643 | } |
| 1644 | 1644 | |
| 1645 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 1646 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 1645 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 1646 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 1647 | 1647 | } |
| 1648 | 1648 | |
| 1649 | 1649 | /** |
@@ -1681,16 +1681,16 @@ discard block |
||
| 1681 | 1681 | */ |
| 1682 | 1682 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 1683 | 1683 | |
| 1684 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1685 | - foreach( $fields as $k => $field ) { |
|
| 1686 | - if( $field->adminOnly ) { |
|
| 1684 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 1685 | + foreach ( $fields as $k => $field ) { |
|
| 1686 | + if ( $field->adminOnly ) { |
|
| 1687 | 1687 | unset( $fields[ $k ] ); |
| 1688 | 1688 | } |
| 1689 | 1689 | } |
| 1690 | 1690 | return $fields; |
| 1691 | 1691 | } |
| 1692 | 1692 | |
| 1693 | - foreach( $fields as &$field ) { |
|
| 1693 | + foreach ( $fields as &$field ) { |
|
| 1694 | 1694 | $field->adminOnly = false; |
| 1695 | 1695 | } |
| 1696 | 1696 | |
@@ -1714,22 +1714,22 @@ discard block |
||
| 1714 | 1714 | */ |
| 1715 | 1715 | function prefill_conditional_logic( $form ) { |
| 1716 | 1716 | |
| 1717 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1717 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1718 | 1718 | return $form; |
| 1719 | 1719 | } |
| 1720 | 1720 | |
| 1721 | 1721 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 1722 | 1722 | /** @var GF_Field $field */ |
| 1723 | - foreach ( $form['fields'] as &$field ) { |
|
| 1723 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1724 | 1724 | |
| 1725 | - if( 'checkbox' === $field->type ) { |
|
| 1725 | + if ( 'checkbox' === $field->type ) { |
|
| 1726 | 1726 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1727 | - $input_id = $input['id']; |
|
| 1727 | + $input_id = $input[ 'id' ]; |
|
| 1728 | 1728 | $choice = $field->choices[ $key ]; |
| 1729 | 1729 | $value = rgar( $this->entry, $input_id ); |
| 1730 | 1730 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 1731 | - if( $match ) { |
|
| 1732 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1731 | + if ( $match ) { |
|
| 1732 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 1733 | 1733 | } |
| 1734 | 1734 | } |
| 1735 | 1735 | } else { |
@@ -1737,15 +1737,15 @@ discard block |
||
| 1737 | 1737 | // We need to run through each field to set the default values |
| 1738 | 1738 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1739 | 1739 | |
| 1740 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1740 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1741 | 1741 | |
| 1742 | - if( 'list' === $field->type ) { |
|
| 1742 | + if ( 'list' === $field->type ) { |
|
| 1743 | 1743 | $list_rows = maybe_unserialize( $field_value ); |
| 1744 | 1744 | |
| 1745 | 1745 | $list_field_value = array(); |
| 1746 | - foreach ( (array) $list_rows as $row ) { |
|
| 1747 | - foreach ( (array) $row as $column ) { |
|
| 1748 | - $list_field_value[] = $column; |
|
| 1746 | + foreach ( (array)$list_rows as $row ) { |
|
| 1747 | + foreach ( (array)$row as $column ) { |
|
| 1748 | + $list_field_value[ ] = $column; |
|
| 1749 | 1749 | } |
| 1750 | 1750 | } |
| 1751 | 1751 | |
@@ -1780,16 +1780,16 @@ discard block |
||
| 1780 | 1780 | */ |
| 1781 | 1781 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 1782 | 1782 | |
| 1783 | - if( $use_conditional_logic ) { |
|
| 1783 | + if ( $use_conditional_logic ) { |
|
| 1784 | 1784 | return $form; |
| 1785 | 1785 | } |
| 1786 | 1786 | |
| 1787 | - foreach( $form['fields'] as &$field ) { |
|
| 1787 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1788 | 1788 | /* @var GF_Field $field */ |
| 1789 | 1789 | $field->conditionalLogic = null; |
| 1790 | 1790 | } |
| 1791 | 1791 | |
| 1792 | - unset( $form['button']['conditionalLogic'] ); |
|
| 1792 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 1793 | 1793 | |
| 1794 | 1794 | return $form; |
| 1795 | 1795 | |
@@ -1806,7 +1806,7 @@ discard block |
||
| 1806 | 1806 | */ |
| 1807 | 1807 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 1808 | 1808 | |
| 1809 | - if( ! $this->is_edit_entry() ) { |
|
| 1809 | + if ( ! $this->is_edit_entry() ) { |
|
| 1810 | 1810 | return $has_conditional_logic; |
| 1811 | 1811 | } |
| 1812 | 1812 | |
@@ -1838,44 +1838,44 @@ discard block |
||
| 1838 | 1838 | * 2. There are two entries embedded using oEmbed |
| 1839 | 1839 | * 3. One of the entries has just been saved |
| 1840 | 1840 | */ |
| 1841 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 1841 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 1842 | 1842 | |
| 1843 | 1843 | $error = true; |
| 1844 | 1844 | |
| 1845 | 1845 | } |
| 1846 | 1846 | |
| 1847 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 1847 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 1848 | 1848 | |
| 1849 | 1849 | $error = true; |
| 1850 | 1850 | |
| 1851 | - } elseif( ! $this->verify_nonce() ) { |
|
| 1851 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 1852 | 1852 | |
| 1853 | 1853 | /** |
| 1854 | 1854 | * If the Entry is embedded, there may be two entries on the same page. |
| 1855 | 1855 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 1856 | 1856 | */ |
| 1857 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1857 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1858 | 1858 | $error = true; |
| 1859 | 1859 | } else { |
| 1860 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 1860 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 1861 | 1861 | } |
| 1862 | 1862 | |
| 1863 | 1863 | } |
| 1864 | 1864 | |
| 1865 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1866 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 1865 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1866 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 1867 | 1867 | } |
| 1868 | 1868 | |
| 1869 | - if( $this->entry['status'] === 'trash' ) { |
|
| 1870 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1869 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 1870 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | 1873 | // No errors; everything's fine here! |
| 1874 | - if( empty( $error ) ) { |
|
| 1874 | + if ( empty( $error ) ) { |
|
| 1875 | 1875 | return true; |
| 1876 | 1876 | } |
| 1877 | 1877 | |
| 1878 | - if( $echo && $error !== true ) { |
|
| 1878 | + if ( $echo && $error !== true ) { |
|
| 1879 | 1879 | |
| 1880 | 1880 | $error = esc_html( $error ); |
| 1881 | 1881 | |
@@ -1883,13 +1883,13 @@ discard block |
||
| 1883 | 1883 | * @since 1.9 |
| 1884 | 1884 | */ |
| 1885 | 1885 | if ( ! empty( $this->entry ) ) { |
| 1886 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1886 | + $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1887 | 1887 | } |
| 1888 | 1888 | |
| 1889 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 1889 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 1890 | 1890 | } |
| 1891 | 1891 | |
| 1892 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
| 1892 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
| 1893 | 1893 | |
| 1894 | 1894 | return false; |
| 1895 | 1895 | } |
@@ -1906,20 +1906,20 @@ discard block |
||
| 1906 | 1906 | |
| 1907 | 1907 | $error = NULL; |
| 1908 | 1908 | |
| 1909 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1910 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 1909 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1910 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 1911 | 1911 | } |
| 1912 | 1912 | |
| 1913 | 1913 | // No errors; everything's fine here! |
| 1914 | - if( empty( $error ) ) { |
|
| 1914 | + if ( empty( $error ) ) { |
|
| 1915 | 1915 | return true; |
| 1916 | 1916 | } |
| 1917 | 1917 | |
| 1918 | - if( $echo ) { |
|
| 1919 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 1918 | + if ( $echo ) { |
|
| 1919 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 1920 | 1920 | } |
| 1921 | 1921 | |
| 1922 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
| 1922 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
| 1923 | 1923 | |
| 1924 | 1924 | return false; |
| 1925 | 1925 | |
@@ -1937,15 +1937,15 @@ discard block |
||
| 1937 | 1937 | private function check_user_cap_edit_field( $field ) { |
| 1938 | 1938 | |
| 1939 | 1939 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 1940 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1940 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1941 | 1941 | return true; |
| 1942 | 1942 | } |
| 1943 | 1943 | |
| 1944 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 1944 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 1945 | 1945 | |
| 1946 | 1946 | // If the field has custom editing capaibilities set, check those |
| 1947 | - if( $field_cap ) { |
|
| 1948 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 1947 | + if ( $field_cap ) { |
|
| 1948 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 1949 | 1949 | } |
| 1950 | 1950 | |
| 1951 | 1951 | return false; |
@@ -1959,17 +1959,17 @@ discard block |
||
| 1959 | 1959 | public function verify_nonce() { |
| 1960 | 1960 | |
| 1961 | 1961 | // Verify form submitted for editing single |
| 1962 | - if( $this->is_edit_entry_submission() ) { |
|
| 1962 | + if ( $this->is_edit_entry_submission() ) { |
|
| 1963 | 1963 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 1964 | 1964 | } |
| 1965 | 1965 | |
| 1966 | 1966 | // Verify |
| 1967 | - else if( ! $this->is_edit_entry() ) { |
|
| 1967 | + else if ( ! $this->is_edit_entry() ) { |
|
| 1968 | 1968 | $valid = false; |
| 1969 | 1969 | } |
| 1970 | 1970 | |
| 1971 | 1971 | else { |
| 1972 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 1972 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 1973 | 1973 | } |
| 1974 | 1974 | |
| 1975 | 1975 | /** |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | private function __construct() {} |
| 86 | 86 | |
| 87 | 87 | private function initialize() { |
| 88 | - add_action( 'wp', array( $this, 'parse_content'), 11 ); |
|
| 88 | + add_action( 'wp', array( $this, 'parse_content' ), 11 ); |
|
| 89 | 89 | add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 ); |
| 90 | - add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 ); |
|
| 90 | + add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 ); |
|
| 91 | 91 | |
| 92 | 92 | // Enqueue scripts and styles after GravityView_Template::register_styles() |
| 93 | 93 | add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 ); |
@@ -237,12 +237,12 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | $this->context_view_id = $view_id; |
| 239 | 239 | |
| 240 | - } elseif ( isset( $_GET['gvid'] ) && $multiple_views ) { |
|
| 240 | + } elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) { |
|
| 241 | 241 | /** |
| 242 | 242 | * used on a has_multiple_views context |
| 243 | 243 | * @see GravityView_API::entry_link |
| 244 | 244 | */ |
| 245 | - $this->context_view_id = $_GET['gvid']; |
|
| 245 | + $this->context_view_id = $_GET[ 'gvid' ]; |
|
| 246 | 246 | |
| 247 | 247 | } elseif ( ! $multiple_views ) { |
| 248 | 248 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
@@ -285,24 +285,24 @@ discard block |
||
| 285 | 285 | global $wp_rewrite; |
| 286 | 286 | |
| 287 | 287 | $is_front_page = ( $query->is_home || $query->is_page ); |
| 288 | - $show_on_front = ( 'page' === get_option('show_on_front') ); |
|
| 289 | - $front_page_id = get_option('page_on_front'); |
|
| 288 | + $show_on_front = ( 'page' === get_option( 'show_on_front' ) ); |
|
| 289 | + $front_page_id = get_option( 'page_on_front' ); |
|
| 290 | 290 | |
| 291 | - if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
| 291 | + if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
| 292 | 292 | |
| 293 | 293 | // Force to be an array, potentially a query string ( entry=16 ) |
| 294 | 294 | $_query = wp_parse_args( $query->query ); |
| 295 | 295 | |
| 296 | 296 | // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. |
| 297 | - if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) { |
|
| 298 | - unset( $_query['pagename'] ); |
|
| 297 | + if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) { |
|
| 298 | + unset( $_query[ 'pagename' ] ); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | // this is where will break from core wordpress |
| 302 | 302 | $ignore = array( 'preview', 'page', 'paged', 'cpage' ); |
| 303 | 303 | $endpoints = rgobj( $wp_rewrite, 'endpoints' ); |
| 304 | - foreach ( (array) $endpoints as $endpoint ) { |
|
| 305 | - $ignore[] = $endpoint[1]; |
|
| 304 | + foreach ( (array)$endpoints as $endpoint ) { |
|
| 305 | + $ignore[ ] = $endpoint[ 1 ]; |
|
| 306 | 306 | } |
| 307 | 307 | unset( $endpoints ); |
| 308 | 308 | |
@@ -312,21 +312,21 @@ discard block |
||
| 312 | 312 | // - The query includes keys that are associated with registered endpoints. `entry`, for example. |
| 313 | 313 | if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) { |
| 314 | 314 | |
| 315 | - $qv =& $query->query_vars; |
|
| 315 | + $qv = & $query->query_vars; |
|
| 316 | 316 | |
| 317 | 317 | // Prevent redirect when on the single entry endpoint |
| 318 | - if( self::is_single_entry() ) { |
|
| 318 | + if ( self::is_single_entry() ) { |
|
| 319 | 319 | add_filter( 'redirect_canonical', '__return_false' ); |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | $query->is_page = true; |
| 323 | 323 | $query->is_home = false; |
| 324 | - $qv['page_id'] = $front_page_id; |
|
| 324 | + $qv[ 'page_id' ] = $front_page_id; |
|
| 325 | 325 | |
| 326 | 326 | // Correct <!--nextpage--> for page_on_front |
| 327 | - if ( ! empty( $qv['paged'] ) ) { |
|
| 328 | - $qv['page'] = $qv['paged']; |
|
| 329 | - unset( $qv['paged'] ); |
|
| 327 | + if ( ! empty( $qv[ 'paged' ] ) ) { |
|
| 328 | + $qv[ 'page' ] = $qv[ 'paged' ]; |
|
| 329 | + unset( $qv[ 'paged' ] ); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | |
| 360 | 360 | $this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' ); |
| 361 | 361 | |
| 362 | - $post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null ); |
|
| 362 | + $post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null ); |
|
| 363 | 363 | $this->setPostId( $post_id ); |
| 364 | 364 | $post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false; |
| 365 | 365 | $this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) ); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | $search_method = GravityView_Widget_Search::getInstance()->get_search_method(); |
| 397 | 397 | |
| 398 | - if( 'post' === $search_method ) { |
|
| 398 | + if ( 'post' === $search_method ) { |
|
| 399 | 399 | $get = $_POST; |
| 400 | 400 | } else { |
| 401 | 401 | $get = $_GET; |
@@ -451,20 +451,20 @@ discard block |
||
| 451 | 451 | * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop |
| 452 | 452 | * @param array $entry Current entry |
| 453 | 453 | */ |
| 454 | - $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry ); |
|
| 454 | + $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry ); |
|
| 455 | 455 | |
| 456 | 456 | if ( ! $apply_outside_loop ) { |
| 457 | 457 | return $title; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | // User reported WooCommerce doesn't pass two args. |
| 461 | - if ( empty( $passed_post_id ) ) { |
|
| 461 | + if ( empty( $passed_post_id ) ) { |
|
| 462 | 462 | return $title; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | // Don't modify the title for anything other than the current view/post. |
| 466 | 466 | // This is true for embedded shortcodes and Views. |
| 467 | - if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
| 467 | + if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
| 468 | 468 | return $title; |
| 469 | 469 | } |
| 470 | 470 | |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | } else { |
| 488 | 488 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 489 | 489 | foreach ( gravityview()->views->all() as $_view ) { |
| 490 | - if ( intval( $_view->form->ID ) === intval( $entry['form_id'] ) ) { |
|
| 490 | + if ( intval( $_view->form->ID ) === intval( $entry[ 'form_id' ] ) ) { |
|
| 491 | 491 | $view = $_view; |
| 492 | 492 | break; |
| 493 | 493 | } |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | } else { |
| 500 | 500 | /** Deprecated. Use gravityview()->views->all() or gravityview()->request->all() */ |
| 501 | 501 | foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) { |
| 502 | - if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) { |
|
| 502 | + if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) { |
|
| 503 | 503 | $view_meta = $view_data; |
| 504 | 504 | break; |
| 505 | 505 | } |
@@ -514,12 +514,12 @@ discard block |
||
| 514 | 514 | } |
| 515 | 515 | } else { |
| 516 | 516 | /** Deprecated stuff in the future. See the branch above. */ |
| 517 | - if ( ! empty( $view_meta['atts']['single_title'] ) ) { |
|
| 517 | + if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) { |
|
| 518 | 518 | |
| 519 | - $title = $view_meta['atts']['single_title']; |
|
| 519 | + $title = $view_meta[ 'atts' ][ 'single_title' ]; |
|
| 520 | 520 | |
| 521 | 521 | // We are allowing HTML in the fields, so no escaping the output |
| 522 | - $title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry ); |
|
| 522 | + $title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry ); |
|
| 523 | 523 | |
| 524 | 524 | $title = do_shortcode( $title ); |
| 525 | 525 | } |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | // Only render in the loop. Fixes issues with the_content filter being applied in places like the sidebar |
| 560 | - if( ! in_the_loop() ) { |
|
| 560 | + if ( ! in_the_loop() ) { |
|
| 561 | 561 | return $content; |
| 562 | 562 | } |
| 563 | 563 | |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | |
| 633 | 633 | $context = GravityView_View::getInstance()->getContext(); |
| 634 | 634 | |
| 635 | - switch( $context ) { |
|
| 635 | + switch ( $context ) { |
|
| 636 | 636 | case 'directory': |
| 637 | 637 | $tab = __( 'Multiple Entries', 'gravityview' ); |
| 638 | 638 | break; |
@@ -646,12 +646,12 @@ discard block |
||
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | |
| 649 | - $title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
| 649 | + $title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
| 650 | 650 | $edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
| 651 | - $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
| 651 | + $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
| 652 | 652 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
| 653 | 653 | |
| 654 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
| 654 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
| 655 | 655 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
| 656 | 656 | |
| 657 | 657 | echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id ); |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | public function render_view( $passed_args ) { |
| 683 | 683 | |
| 684 | 684 | // validate attributes |
| 685 | - if ( empty( $passed_args['id'] ) ) { |
|
| 685 | + if ( empty( $passed_args[ 'id' ] ) ) { |
|
| 686 | 686 | do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args ); |
| 687 | 687 | return null; |
| 688 | 688 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | return null; |
| 705 | 705 | } |
| 706 | 706 | |
| 707 | - $view_id = $passed_args['id']; |
|
| 707 | + $view_id = $passed_args[ 'id' ]; |
|
| 708 | 708 | |
| 709 | 709 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 710 | 710 | $view = gravityview()->views->get( $view_id ); |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | $passed_args = array_filter( $passed_args, 'strlen' ); |
| 735 | 735 | |
| 736 | 736 | //Override shortcode args over View template settings |
| 737 | - $atts = wp_parse_args( $passed_args, $view_data['atts'] ); |
|
| 737 | + $atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] ); |
|
| 738 | 738 | |
| 739 | 739 | do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts ); |
| 740 | 740 | } |
@@ -758,14 +758,14 @@ discard block |
||
| 758 | 758 | * @since 1.15 |
| 759 | 759 | * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out. |
| 760 | 760 | */ |
| 761 | - if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 761 | + if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 762 | 762 | |
| 763 | 763 | do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) ); |
| 764 | 764 | |
| 765 | 765 | return null; |
| 766 | 766 | } |
| 767 | 767 | |
| 768 | - if( $this->isGravityviewPostType() ) { |
|
| 768 | + if ( $this->isGravityviewPostType() ) { |
|
| 769 | 769 | |
| 770 | 770 | /** |
| 771 | 771 | * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode? |
@@ -781,10 +781,10 @@ discard block |
||
| 781 | 781 | $embed_only = $view->settings->get( 'embed_only' ); |
| 782 | 782 | } else { |
| 783 | 783 | /** Deprecated. View attributes moved to \GV\View::$settings. */ |
| 784 | - $embed_only = ! empty( $atts['embed_only'] ); |
|
| 784 | + $embed_only = ! empty( $atts[ 'embed_only' ] ); |
|
| 785 | 785 | } |
| 786 | 786 | |
| 787 | - if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
| 787 | + if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
| 788 | 788 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 789 | 789 | } |
| 790 | 790 | } |
@@ -800,13 +800,13 @@ discard block |
||
| 800 | 800 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 801 | 801 | $view_data = $view->as_data(); |
| 802 | 802 | $gravityview_view = new GravityView_View( $view_data ); |
| 803 | - $post_id = intval( $view->settings->get( 'post_id' ) ? : get_the_ID() ); |
|
| 803 | + $post_id = intval( $view->settings->get( 'post_id' ) ?: get_the_ID() ); |
|
| 804 | 804 | $template_id = $view->template ? $view->template->ID : null; |
| 805 | 805 | } else { |
| 806 | 806 | /** These constructs are deprecated. Use the new gravityview() wrapper. */ |
| 807 | 807 | $gravityview_view = new GravityView_View( $view_data ); |
| 808 | - $post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : get_the_ID(); |
|
| 809 | - $template_id = $view_data['template_id']; |
|
| 808 | + $post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : get_the_ID(); |
|
| 809 | + $template_id = $view_data[ 'template_id' ]; |
|
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | $gravityview_view->setPostId( $post_id ); |
@@ -817,20 +817,20 @@ discard block |
||
| 817 | 817 | do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' ); |
| 818 | 818 | |
| 819 | 819 | //fetch template and slug |
| 820 | - $view_slug = apply_filters( 'gravityview_template_slug_'. $template_id, 'table', 'directory' ); |
|
| 820 | + $view_slug = apply_filters( 'gravityview_template_slug_' . $template_id, 'table', 'directory' ); |
|
| 821 | 821 | |
| 822 | 822 | do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug ); |
| 823 | 823 | |
| 824 | 824 | /** |
| 825 | 825 | * Disable fetching initial entries for views that don't need it (DataTables) |
| 826 | 826 | */ |
| 827 | - $get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true ); |
|
| 827 | + $get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true ); |
|
| 828 | 828 | |
| 829 | 829 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 830 | 830 | $hide_until_searched = $view->settings->get( 'hide_until_searched' ); |
| 831 | 831 | } else { |
| 832 | 832 | /** $atts is deprecated, use \GV\View:$settings */ |
| 833 | - $hide_until_searched = ! empty( $atts['hide_until_searched'] ); |
|
| 833 | + $hide_until_searched = ! empty( $atts[ 'hide_until_searched' ] ); |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | /** |
@@ -848,12 +848,12 @@ discard block |
||
| 848 | 848 | $sort_columns = $view->settings->get( 'sort_columns' ); |
| 849 | 849 | } else { |
| 850 | 850 | /** $atts is deprecated, use \GV\View:$settings */ |
| 851 | - $sort_columns = ! empty( $atts['sort_columns'] ); |
|
| 851 | + $sort_columns = ! empty( $atts[ 'sort_columns' ] ); |
|
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | if ( $sort_columns ) { |
| 855 | 855 | // add filter to enable column sorting |
| 856 | - add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 ); |
|
| 856 | + add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 ); |
|
| 857 | 857 | } |
| 858 | 858 | |
| 859 | 859 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
@@ -861,19 +861,19 @@ discard block |
||
| 861 | 861 | } else { |
| 862 | 862 | /** $atts is deprecated, use \GV\View:$settings */ |
| 863 | 863 | /** $view_data is depreacted, use \GV\View properties */ |
| 864 | - $view_entries = self::get_view_entries( $atts, $view_data['form_id'] ); |
|
| 864 | + $view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] ); |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | - do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) ); |
|
| 867 | + do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) ); |
|
| 868 | 868 | |
| 869 | 869 | } else { |
| 870 | 870 | |
| 871 | 871 | $view_entries = array( 'count' => null, 'entries' => null, 'paging' => null ); |
| 872 | 872 | |
| 873 | - do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' ); |
|
| 873 | + do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' ); |
|
| 874 | 874 | } |
| 875 | 875 | |
| 876 | - $gravityview_view->setPaging( $view_entries['paging'] ); |
|
| 876 | + $gravityview_view->setPaging( $view_entries[ 'paging' ] ); |
|
| 877 | 877 | $gravityview_view->setContext( 'directory' ); |
| 878 | 878 | $sections = array( 'header', 'body', 'footer' ); |
| 879 | 879 | |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | do_action( 'gravityview_render_entry_' . $view->ID ); |
| 891 | 891 | } else { |
| 892 | 892 | /** $view_data is depreacted, use \GV\View properties */ |
| 893 | - do_action( 'gravityview_render_entry_'.$view_data['id'] ); |
|
| 893 | + do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] ); |
|
| 894 | 894 | } |
| 895 | 895 | |
| 896 | 896 | $entry = $this->getEntry(); |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' ); |
| 902 | 902 | |
| 903 | 903 | // Only display warning once when multiple Views are embedded |
| 904 | - if( $view_id !== (int) GravityView_frontend::get_context_view_id() ) { |
|
| 904 | + if ( $view_id !== (int)GravityView_frontend::get_context_view_id() ) { |
|
| 905 | 905 | ob_end_clean(); |
| 906 | 906 | return null; |
| 907 | 907 | } |
@@ -926,7 +926,7 @@ discard block |
||
| 926 | 926 | // important: do not remove this as it prevents fake attempts of displaying entries from other views/forms |
| 927 | 927 | $multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $this->getGvOutputData()->has_multiple_views(); |
| 928 | 928 | if ( $multiple_views && $view_id != $this->get_context_view_id() ) { |
| 929 | - do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id ); |
|
| 929 | + do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id ); |
|
| 930 | 930 | ob_end_clean(); |
| 931 | 931 | return null; |
| 932 | 932 | } |
@@ -936,14 +936,14 @@ discard block |
||
| 936 | 936 | do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug ); |
| 937 | 937 | |
| 938 | 938 | //fetch entry detail |
| 939 | - $view_entries['count'] = 1; |
|
| 940 | - $view_entries['entries'][] = $entry; |
|
| 941 | - do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] ); |
|
| 939 | + $view_entries[ 'count' ] = 1; |
|
| 940 | + $view_entries[ 'entries' ][ ] = $entry; |
|
| 941 | + do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] ); |
|
| 942 | 942 | |
| 943 | 943 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 944 | 944 | $back_link_label = $view->settings->get( 'back_link_label', null ); |
| 945 | 945 | } else { |
| 946 | - $back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null; |
|
| 946 | + $back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null; |
|
| 947 | 947 | } |
| 948 | 948 | |
| 949 | 949 | // set back link label |
@@ -957,8 +957,8 @@ discard block |
||
| 957 | 957 | self::add_style( $template_id ); |
| 958 | 958 | |
| 959 | 959 | // Prepare to render view and set vars |
| 960 | - $gravityview_view->setEntries( $view_entries['entries'] ); |
|
| 961 | - $gravityview_view->setTotalEntries( $view_entries['count'] ); |
|
| 960 | + $gravityview_view->setEntries( $view_entries[ 'entries' ] ); |
|
| 961 | + $gravityview_view->setTotalEntries( $view_entries[ 'count' ] ); |
|
| 962 | 962 | |
| 963 | 963 | // If Edit |
| 964 | 964 | if ( 'edit' === gravityview_get_context() ) { |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | |
| 976 | 976 | do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections ); |
| 977 | 977 | foreach ( $sections as $section ) { |
| 978 | - do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' ); |
|
| 978 | + do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' ); |
|
| 979 | 979 | $gravityview_view->render( $view_slug, $section, false ); |
| 980 | 980 | } |
| 981 | 981 | } |
@@ -1029,7 +1029,7 @@ discard block |
||
| 1029 | 1029 | $datetime_format = 'Y-m-d H:i:s'; |
| 1030 | 1030 | $search_is_outside_view_bounds = false; |
| 1031 | 1031 | |
| 1032 | - if( ! empty( $search_criteria[ $key ] ) ) { |
|
| 1032 | + if ( ! empty( $search_criteria[ $key ] ) ) { |
|
| 1033 | 1033 | |
| 1034 | 1034 | $search_date = strtotime( $search_criteria[ $key ] ); |
| 1035 | 1035 | |
@@ -1057,14 +1057,14 @@ discard block |
||
| 1057 | 1057 | if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
| 1058 | 1058 | |
| 1059 | 1059 | // Then we override the search and re-set the start date |
| 1060 | - $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
| 1060 | + $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
| 1061 | 1061 | } |
| 1062 | 1062 | } |
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | - if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
| 1065 | + if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
| 1066 | 1066 | // The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
| 1067 | - if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
| 1067 | + if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
| 1068 | 1068 | do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria ); |
| 1069 | 1069 | } |
| 1070 | 1070 | } |
@@ -1083,19 +1083,19 @@ discard block |
||
| 1083 | 1083 | public static function process_search_only_approved( $args, $search_criteria ) { |
| 1084 | 1084 | |
| 1085 | 1085 | /** @since 1.19 */ |
| 1086 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
| 1086 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 1087 | 1087 | do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries; showing all approval statuses' ); |
| 1088 | 1088 | return $search_criteria; |
| 1089 | 1089 | } |
| 1090 | 1090 | |
| 1091 | - if ( ! empty( $args['show_only_approved'] ) ) { |
|
| 1091 | + if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
| 1092 | 1092 | |
| 1093 | - $search_criteria['field_filters'][] = array( |
|
| 1093 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 1094 | 1094 | 'key' => GravityView_Entry_Approval::meta_key, |
| 1095 | 1095 | 'value' => GravityView_Entry_Approval_Status::APPROVED |
| 1096 | 1096 | ); |
| 1097 | 1097 | |
| 1098 | - $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
| 1098 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
| 1099 | 1099 | |
| 1100 | 1100 | do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria ); |
| 1101 | 1101 | } |
@@ -1122,18 +1122,18 @@ discard block |
||
| 1122 | 1122 | */ |
| 1123 | 1123 | public static function is_entry_approved( $entry, $args = array() ) { |
| 1124 | 1124 | |
| 1125 | - if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
| 1125 | + if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
| 1126 | 1126 | // is implicitly approved if entry is null or View settings doesn't require to check for approval |
| 1127 | 1127 | return true; |
| 1128 | 1128 | } |
| 1129 | 1129 | |
| 1130 | 1130 | /** @since 1.19 */ |
| 1131 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
| 1131 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 1132 | 1132 | do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries, so entry is approved for viewing' ); |
| 1133 | 1133 | return true; |
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | - $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
| 1136 | + $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
| 1137 | 1137 | |
| 1138 | 1138 | return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
| 1139 | 1139 | } |
@@ -1167,29 +1167,29 @@ discard block |
||
| 1167 | 1167 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria ); |
| 1168 | 1168 | |
| 1169 | 1169 | // implicity search |
| 1170 | - if ( ! empty( $args['search_value'] ) ) { |
|
| 1170 | + if ( ! empty( $args[ 'search_value' ] ) ) { |
|
| 1171 | 1171 | |
| 1172 | 1172 | // Search operator options. Options: `is` or `contains` |
| 1173 | - $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
| 1173 | + $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
| 1174 | 1174 | |
| 1175 | - $search_criteria['field_filters'][] = array( |
|
| 1175 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 1176 | 1176 | 'key' => rgget( 'search_field', $args ), // The field ID to search |
| 1177 | - 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
| 1177 | + 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
| 1178 | 1178 | 'operator' => $operator, |
| 1179 | 1179 | ); |
| 1180 | 1180 | |
| 1181 | 1181 | // Lock search mode to "all" with implicit presearch filter. |
| 1182 | - $search_criteria['field_filters']['mode'] = 'all'; |
|
| 1182 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
| 1183 | 1183 | } |
| 1184 | 1184 | |
| 1185 | - if( $search_criteria !== $original_search_criteria ) { |
|
| 1185 | + if ( $search_criteria !== $original_search_criteria ) { |
|
| 1186 | 1186 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria ); |
| 1187 | 1187 | } |
| 1188 | 1188 | |
| 1189 | 1189 | // Handle setting date range |
| 1190 | 1190 | $search_criteria = self::process_search_dates( $args, $search_criteria ); |
| 1191 | 1191 | |
| 1192 | - if( $search_criteria !== $original_search_criteria ) { |
|
| 1192 | + if ( $search_criteria !== $original_search_criteria ) { |
|
| 1193 | 1193 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria ); |
| 1194 | 1194 | } |
| 1195 | 1195 | |
@@ -1200,7 +1200,7 @@ discard block |
||
| 1200 | 1200 | * @filter `gravityview_status` Modify entry status requirements to be included in search results. |
| 1201 | 1201 | * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
| 1202 | 1202 | */ |
| 1203 | - $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
| 1203 | + $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
| 1204 | 1204 | |
| 1205 | 1205 | return $search_criteria; |
| 1206 | 1206 | } |
@@ -1324,7 +1324,7 @@ discard block |
||
| 1324 | 1324 | 'search_criteria' => $search_criteria, |
| 1325 | 1325 | 'sorting' => self::updateViewSorting( $args, $form_id ), |
| 1326 | 1326 | 'paging' => $paging, |
| 1327 | - 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
| 1327 | + 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
| 1328 | 1328 | ); |
| 1329 | 1329 | |
| 1330 | 1330 | /** |
@@ -1349,7 +1349,7 @@ discard block |
||
| 1349 | 1349 | * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
| 1350 | 1350 | * @param array $args View configuration args. |
| 1351 | 1351 | */ |
| 1352 | - $parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id ); |
|
| 1352 | + $parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id ); |
|
| 1353 | 1353 | |
| 1354 | 1354 | do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters ); |
| 1355 | 1355 | |
@@ -1374,17 +1374,17 @@ discard block |
||
| 1374 | 1374 | $default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
| 1375 | 1375 | |
| 1376 | 1376 | // Paging & offset |
| 1377 | - $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
| 1377 | + $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
| 1378 | 1378 | |
| 1379 | 1379 | if ( -1 === $page_size ) { |
| 1380 | 1380 | $page_size = PHP_INT_MAX; |
| 1381 | 1381 | } |
| 1382 | 1382 | |
| 1383 | - $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
| 1383 | + $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
| 1384 | 1384 | $offset = ( $curr_page - 1 ) * $page_size; |
| 1385 | 1385 | |
| 1386 | - if ( ! empty( $args['offset'] ) ) { |
|
| 1387 | - $offset += intval( $args['offset'] ); |
|
| 1386 | + if ( ! empty( $args[ 'offset' ] ) ) { |
|
| 1387 | + $offset += intval( $args[ 'offset' ] ); |
|
| 1388 | 1388 | } |
| 1389 | 1389 | |
| 1390 | 1390 | $paging = array( |
@@ -1408,8 +1408,8 @@ discard block |
||
| 1408 | 1408 | */ |
| 1409 | 1409 | public static function updateViewSorting( $args, $form_id ) { |
| 1410 | 1410 | $sorting = array(); |
| 1411 | - $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' ); |
|
| 1412 | - $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' ); |
|
| 1411 | + $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' ); |
|
| 1412 | + $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' ); |
|
| 1413 | 1413 | |
| 1414 | 1414 | $sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id ); |
| 1415 | 1415 | |
@@ -1449,11 +1449,11 @@ discard block |
||
| 1449 | 1449 | |
| 1450 | 1450 | $sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
| 1451 | 1451 | |
| 1452 | - if( ! $sort_field ) { |
|
| 1452 | + if ( ! $sort_field ) { |
|
| 1453 | 1453 | return $sort_field_id; |
| 1454 | 1454 | } |
| 1455 | 1455 | |
| 1456 | - switch ( $sort_field['type'] ) { |
|
| 1456 | + switch ( $sort_field[ 'type' ] ) { |
|
| 1457 | 1457 | |
| 1458 | 1458 | case 'address': |
| 1459 | 1459 | // Sorting by full address |
@@ -1470,7 +1470,7 @@ discard block |
||
| 1470 | 1470 | */ |
| 1471 | 1471 | $address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
| 1472 | 1472 | |
| 1473 | - switch( strtolower( $address_part ) ){ |
|
| 1473 | + switch ( strtolower( $address_part ) ) { |
|
| 1474 | 1474 | case 'street': |
| 1475 | 1475 | $sort_field_id .= '.1'; |
| 1476 | 1476 | break; |
@@ -1555,7 +1555,7 @@ discard block |
||
| 1555 | 1555 | */ |
| 1556 | 1556 | $single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
| 1557 | 1557 | |
| 1558 | - if ( empty( $single_entry ) ){ |
|
| 1558 | + if ( empty( $single_entry ) ) { |
|
| 1559 | 1559 | return false; |
| 1560 | 1560 | } else { |
| 1561 | 1561 | return $single_entry; |
@@ -1588,14 +1588,14 @@ discard block |
||
| 1588 | 1588 | $template_id = $view->template ? $view->template->ID : null; |
| 1589 | 1589 | $data = $view->as_data(); |
| 1590 | 1590 | } else { |
| 1591 | - $template_id = $data['template_id']; |
|
| 1591 | + $template_id = $data[ 'template_id' ]; |
|
| 1592 | 1592 | } |
| 1593 | 1593 | |
| 1594 | 1594 | /** |
| 1595 | 1595 | * Don't enqueue the scripts or styles if it's not going to be displayed. |
| 1596 | 1596 | * @since 1.15 |
| 1597 | 1597 | */ |
| 1598 | - if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 1598 | + if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 1599 | 1599 | continue; |
| 1600 | 1600 | } |
| 1601 | 1601 | |
@@ -1607,7 +1607,7 @@ discard block |
||
| 1607 | 1607 | $lightbox = $view->settings->get( 'lightbox' ); |
| 1608 | 1608 | } else { |
| 1609 | 1609 | /** View data attributes are now stored in \GV\View::$settings */ |
| 1610 | - $lightbox = ! empty( $data['atts']['lightbox'] ); |
|
| 1610 | + $lightbox = ! empty( $data[ 'atts' ][ 'lightbox' ] ); |
|
| 1611 | 1611 | } |
| 1612 | 1612 | |
| 1613 | 1613 | // If the thickbox is enqueued, add dependencies |
@@ -1617,13 +1617,13 @@ discard block |
||
| 1617 | 1617 | * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox` |
| 1618 | 1618 | * @param string $script_slug If you want to use a different lightbox script, return the name of it here. |
| 1619 | 1619 | */ |
| 1620 | - $js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
| 1620 | + $js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
| 1621 | 1621 | |
| 1622 | 1622 | /** |
| 1623 | 1623 | * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox` |
| 1624 | 1624 | * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here. |
| 1625 | 1625 | */ |
| 1626 | - $css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
| 1626 | + $css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
| 1627 | 1627 | } |
| 1628 | 1628 | |
| 1629 | 1629 | /** |
@@ -1631,19 +1631,19 @@ discard block |
||
| 1631 | 1631 | * @see https://github.com/katzwebservices/GravityView/issues/536 |
| 1632 | 1632 | * @since 1.15 |
| 1633 | 1633 | */ |
| 1634 | - if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
| 1635 | - $css_dependencies[] = 'dashicons'; |
|
| 1634 | + if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
| 1635 | + $css_dependencies[ ] = 'dashicons'; |
|
| 1636 | 1636 | } |
| 1637 | 1637 | |
| 1638 | 1638 | wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
| 1639 | 1639 | |
| 1640 | 1640 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 1641 | 1641 | |
| 1642 | - wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true ); |
|
| 1642 | + wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true ); |
|
| 1643 | 1643 | |
| 1644 | 1644 | wp_enqueue_script( 'gravityview-fe-view' ); |
| 1645 | 1645 | |
| 1646 | - if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
| 1646 | + if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
| 1647 | 1647 | wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
| 1648 | 1648 | } |
| 1649 | 1649 | |
@@ -1711,7 +1711,7 @@ discard block |
||
| 1711 | 1711 | } elseif ( empty( $template_id ) ) { |
| 1712 | 1712 | do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' ); |
| 1713 | 1713 | } else { |
| 1714 | - do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) ); |
|
| 1714 | + do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) ); |
|
| 1715 | 1715 | } |
| 1716 | 1716 | |
| 1717 | 1717 | } |
@@ -1736,11 +1736,11 @@ discard block |
||
| 1736 | 1736 | * Not a table-based template; don't add sort icons |
| 1737 | 1737 | * @since 1.12 |
| 1738 | 1738 | */ |
| 1739 | - if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
| 1739 | + if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
| 1740 | 1740 | return $label; |
| 1741 | 1741 | } |
| 1742 | 1742 | |
| 1743 | - if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
| 1743 | + if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
| 1744 | 1744 | return $label; |
| 1745 | 1745 | } |
| 1746 | 1746 | |
@@ -1748,29 +1748,29 @@ discard block |
||
| 1748 | 1748 | |
| 1749 | 1749 | $class = 'gv-sort'; |
| 1750 | 1750 | |
| 1751 | - $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
| 1751 | + $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
| 1752 | 1752 | |
| 1753 | 1753 | $sort_args = array( |
| 1754 | - 'sort' => $field['id'], |
|
| 1754 | + 'sort' => $field[ 'id' ], |
|
| 1755 | 1755 | 'dir' => 'asc', |
| 1756 | 1756 | ); |
| 1757 | 1757 | |
| 1758 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
| 1758 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
| 1759 | 1759 | //toggle sorting direction. |
| 1760 | - if ( 'asc' === $sorting['direction'] ) { |
|
| 1761 | - $sort_args['dir'] = 'desc'; |
|
| 1760 | + if ( 'asc' === $sorting[ 'direction' ] ) { |
|
| 1761 | + $sort_args[ 'dir' ] = 'desc'; |
|
| 1762 | 1762 | $class .= ' gv-icon-sort-desc'; |
| 1763 | 1763 | } else { |
| 1764 | - $sort_args['dir'] = 'asc'; |
|
| 1764 | + $sort_args[ 'dir' ] = 'asc'; |
|
| 1765 | 1765 | $class .= ' gv-icon-sort-asc'; |
| 1766 | 1766 | } |
| 1767 | 1767 | } else { |
| 1768 | 1768 | $class .= ' gv-icon-caret-up-down'; |
| 1769 | 1769 | } |
| 1770 | 1770 | |
| 1771 | - $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
| 1771 | + $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
| 1772 | 1772 | |
| 1773 | - return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
| 1773 | + return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
| 1774 | 1774 | |
| 1775 | 1775 | } |
| 1776 | 1776 | |
@@ -1788,7 +1788,7 @@ discard block |
||
| 1788 | 1788 | |
| 1789 | 1789 | $field_type = $field_id; |
| 1790 | 1790 | |
| 1791 | - if( is_numeric( $field_id ) ) { |
|
| 1791 | + if ( is_numeric( $field_id ) ) { |
|
| 1792 | 1792 | $field = GFFormsModel::get_field( $form, $field_id ); |
| 1793 | 1793 | $field_type = $field->type; |
| 1794 | 1794 | } |
@@ -1811,7 +1811,7 @@ discard block |
||
| 1811 | 1811 | return false; |
| 1812 | 1812 | } |
| 1813 | 1813 | |
| 1814 | - return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
| 1814 | + return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
| 1815 | 1815 | |
| 1816 | 1816 | } |
| 1817 | 1817 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | 'type' => 'radio', |
| 64 | 64 | 'full_width' => true, |
| 65 | 65 | 'label' => esc_html__( 'Search Mode', 'gravityview' ), |
| 66 | - 'desc' => __('Should search results match all search fields, or any?', 'gravityview'), |
|
| 66 | + 'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ), |
|
| 67 | 67 | 'value' => 'any', |
| 68 | 68 | 'class' => 'hide-if-js', |
| 69 | 69 | 'options' => array( |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
| 87 | 87 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
| 88 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 88 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 89 | 89 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
| 90 | 90 | |
| 91 | 91 | // ajax - get the searchable fields |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 222 | 222 | $script_source = empty( $script_min ) ? '/source' : ''; |
| 223 | 223 | |
| 224 | - wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version ); |
|
| 224 | + wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version ); |
|
| 225 | 225 | |
| 226 | 226 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
| 227 | 227 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
| 244 | 244 | */ |
| 245 | 245 | public function register_no_conflict( $allowed ) { |
| 246 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
| 246 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
| 247 | 247 | return $allowed; |
| 248 | 248 | } |
| 249 | 249 | |
@@ -256,24 +256,24 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public static function get_searchable_fields() { |
| 258 | 258 | |
| 259 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 259 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 260 | 260 | exit( '0' ); |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | $form = ''; |
| 264 | 264 | |
| 265 | 265 | // Fetch the form for the current View |
| 266 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
| 266 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
| 267 | 267 | |
| 268 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
| 268 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
| 269 | 269 | |
| 270 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
| 270 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
| 271 | 271 | |
| 272 | - $form = (int) $_POST['formid']; |
|
| 272 | + $form = (int)$_POST[ 'formid' ]; |
|
| 273 | 273 | |
| 274 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 274 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 275 | 275 | |
| 276 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
| 276 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
| 277 | 277 | |
| 278 | 278 | } |
| 279 | 279 | |
@@ -318,8 +318,8 @@ discard block |
||
| 318 | 318 | ) |
| 319 | 319 | ); |
| 320 | 320 | |
| 321 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 322 | - $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] ); |
|
| 321 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 322 | + $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] ); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | // Get fields with sub-inputs and no parent |
@@ -341,13 +341,13 @@ discard block |
||
| 341 | 341 | |
| 342 | 342 | foreach ( $fields as $id => $field ) { |
| 343 | 343 | |
| 344 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 344 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 345 | 345 | continue; |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
| 348 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
| 349 | 349 | |
| 350 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
| 350 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
| 371 | 371 | |
| 372 | 372 | // @todo - This needs to be improved - many fields have . including products and addresses |
| 373 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 373 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 374 | 374 | $input_type = 'boolean'; // on/off checkbox |
| 375 | 375 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
| 376 | 376 | $input_type = 'multi'; //multiselect |
@@ -414,19 +414,19 @@ discard block |
||
| 414 | 414 | $post_id = 0; |
| 415 | 415 | |
| 416 | 416 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
| 417 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
| 418 | - $post_id = absint( $widget_args['post_id'] ); |
|
| 417 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
| 418 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
| 419 | 419 | } |
| 420 | 420 | // We're in the WordPress Widget context, and the base View ID should be used |
| 421 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
| 422 | - $post_id = absint( $widget_args['view_id'] ); |
|
| 421 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
| 422 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | $args = gravityview_get_permalink_query_args( $post_id ); |
| 426 | 426 | |
| 427 | 427 | // Add hidden fields to the search form |
| 428 | 428 | foreach ( $args as $key => $value ) { |
| 429 | - $search_fields[] = array( |
|
| 429 | + $search_fields[ ] = array( |
|
| 430 | 430 | 'name' => $key, |
| 431 | 431 | 'input' => 'hidden', |
| 432 | 432 | 'value' => $value, |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | */ |
| 448 | 448 | public function filter_entries( $search_criteria ) { |
| 449 | 449 | |
| 450 | - if( 'post' === $this->search_method ) { |
|
| 450 | + if ( 'post' === $this->search_method ) { |
|
| 451 | 451 | $get = $_POST; |
| 452 | 452 | } else { |
| 453 | 453 | $get = $_GET; |
@@ -464,12 +464,12 @@ discard block |
||
| 464 | 464 | $get = gv_map_deep( $get, 'rawurldecode' ); |
| 465 | 465 | |
| 466 | 466 | // Make sure array key is set up |
| 467 | - $search_criteria['field_filters'] = rgar( $search_criteria, 'field_filters', array() ); |
|
| 467 | + $search_criteria[ 'field_filters' ] = rgar( $search_criteria, 'field_filters', array() ); |
|
| 468 | 468 | |
| 469 | 469 | // add free search |
| 470 | - if ( ! empty( $get['gv_search'] ) ) { |
|
| 470 | + if ( ! empty( $get[ 'gv_search' ] ) ) { |
|
| 471 | 471 | |
| 472 | - $search_all_value = trim( $get['gv_search'] ); |
|
| 472 | + $search_all_value = trim( $get[ 'gv_search' ] ); |
|
| 473 | 473 | |
| 474 | 474 | /** |
| 475 | 475 | * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase? |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | $split_words = apply_filters( 'gravityview/search-all-split-words', true ); |
| 480 | 480 | |
| 481 | - if( $split_words ) { |
|
| 481 | + if ( $split_words ) { |
|
| 482 | 482 | |
| 483 | 483 | // Search for a piece |
| 484 | 484 | $words = explode( ' ', $search_all_value ); |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | foreach ( $words as $word ) { |
| 497 | - $search_criteria['field_filters'][] = array( |
|
| 497 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 498 | 498 | 'key' => null, // The field ID to search |
| 499 | 499 | 'value' => $word, // The value to search |
| 500 | 500 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -503,8 +503,8 @@ discard block |
||
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | //start date & end date |
| 506 | - $curr_start = !empty( $get['gv_start'] ) ? $get['gv_start'] : ''; |
|
| 507 | - $curr_end = !empty( $get['gv_start'] ) ? $get['gv_end'] : ''; |
|
| 506 | + $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : ''; |
|
| 507 | + $curr_end = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_end' ] : ''; |
|
| 508 | 508 | |
| 509 | 509 | /** |
| 510 | 510 | * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n |
@@ -519,16 +519,16 @@ discard block |
||
| 519 | 519 | /** |
| 520 | 520 | * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries) |
| 521 | 521 | */ |
| 522 | - if( !empty( $curr_start ) ) { |
|
| 523 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 522 | + if ( ! empty( $curr_start ) ) { |
|
| 523 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 524 | 524 | } |
| 525 | - if( !empty( $curr_end ) ) { |
|
| 526 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 525 | + if ( ! empty( $curr_end ) ) { |
|
| 526 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 527 | 527 | } |
| 528 | 528 | |
| 529 | 529 | // search for a specific entry ID |
| 530 | 530 | if ( ! empty( $get[ 'gv_id' ] ) ) { |
| 531 | - $search_criteria['field_filters'][] = array( |
|
| 531 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 532 | 532 | 'key' => 'id', |
| 533 | 533 | 'value' => absint( $get[ 'gv_id' ] ), |
| 534 | 534 | 'operator' => '=', |
@@ -537,36 +537,36 @@ discard block |
||
| 537 | 537 | |
| 538 | 538 | // search for a specific Created_by ID |
| 539 | 539 | if ( ! empty( $get[ 'gv_by' ] ) ) { |
| 540 | - $search_criteria['field_filters'][] = array( |
|
| 540 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 541 | 541 | 'key' => 'created_by', |
| 542 | - 'value' => absint( $get['gv_by'] ), |
|
| 542 | + 'value' => absint( $get[ 'gv_by' ] ), |
|
| 543 | 543 | 'operator' => '=', |
| 544 | 544 | ); |
| 545 | 545 | } |
| 546 | 546 | |
| 547 | 547 | |
| 548 | 548 | // Get search mode passed in URL |
| 549 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
| 549 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
| 550 | 550 | |
| 551 | 551 | // get the other search filters |
| 552 | 552 | foreach ( $get as $key => $value ) { |
| 553 | 553 | |
| 554 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false ) ) ) { |
|
| 554 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false ) ) ) { |
|
| 555 | 555 | continue; |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | 558 | // could return simple filter or multiple filters |
| 559 | 559 | $filter = $this->prepare_field_filter( $key, $value ); |
| 560 | 560 | |
| 561 | - if ( isset( $filter[0]['value'] ) ) { |
|
| 562 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
| 561 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
| 562 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
| 563 | 563 | |
| 564 | 564 | // if date range type, set search mode to ALL |
| 565 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 565 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 566 | 566 | $mode = 'all'; |
| 567 | 567 | } |
| 568 | - } elseif( !empty( $filter ) ) { |
|
| 569 | - $search_criteria['field_filters'][] = $filter; |
|
| 568 | + } elseif ( ! empty( $filter ) ) { |
|
| 569 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
| 570 | 570 | } |
| 571 | 571 | } |
| 572 | 572 | |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | * @since 1.5.1 |
| 576 | 576 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
| 577 | 577 | */ |
| 578 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 578 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 579 | 579 | |
| 580 | 580 | do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria ); |
| 581 | 581 | |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | $field_id = str_replace( 'filter_', '', $key ); |
| 602 | 602 | |
| 603 | 603 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
| 604 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
| 604 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
| 605 | 605 | $field_id = str_replace( '_', '.', $field_id ); |
| 606 | 606 | } |
| 607 | 607 | |
@@ -615,11 +615,11 @@ discard block |
||
| 615 | 615 | 'value' => $value, |
| 616 | 616 | ); |
| 617 | 617 | |
| 618 | - switch ( $form_field['type'] ) { |
|
| 618 | + switch ( $form_field[ 'type' ] ) { |
|
| 619 | 619 | |
| 620 | 620 | case 'select': |
| 621 | 621 | case 'radio': |
| 622 | - $filter['operator'] = 'is'; |
|
| 622 | + $filter[ 'operator' ] = 'is'; |
|
| 623 | 623 | break; |
| 624 | 624 | |
| 625 | 625 | case 'post_category': |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | |
| 634 | 634 | foreach ( $value as $val ) { |
| 635 | 635 | $cat = get_term( $val, 'category' ); |
| 636 | - $filter[] = array( |
|
| 636 | + $filter[ ] = array( |
|
| 637 | 637 | 'key' => $field_id, |
| 638 | 638 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
| 639 | 639 | 'operator' => 'is', |
@@ -652,18 +652,18 @@ discard block |
||
| 652 | 652 | $filter = array(); |
| 653 | 653 | |
| 654 | 654 | foreach ( $value as $val ) { |
| 655 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
| 655 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | break; |
| 659 | 659 | |
| 660 | 660 | case 'checkbox': |
| 661 | 661 | // convert checkbox on/off into the correct search filter |
| 662 | - if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) { |
|
| 663 | - foreach ( $form_field['inputs'] as $k => $input ) { |
|
| 664 | - if ( $input['id'] == $field_id ) { |
|
| 665 | - $filter['value'] = $form_field['choices'][ $k ]['value']; |
|
| 666 | - $filter['operator'] = 'is'; |
|
| 662 | + if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field[ 'inputs' ] ) && ! empty( $form_field[ 'choices' ] ) ) { |
|
| 663 | + foreach ( $form_field[ 'inputs' ] as $k => $input ) { |
|
| 664 | + if ( $input[ 'id' ] == $field_id ) { |
|
| 665 | + $filter[ 'value' ] = $form_field[ 'choices' ][ $k ][ 'value' ]; |
|
| 666 | + $filter[ 'operator' ] = 'is'; |
|
| 667 | 667 | break; |
| 668 | 668 | } |
| 669 | 669 | } |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | $filter = array(); |
| 674 | 674 | |
| 675 | 675 | foreach ( $value as $val ) { |
| 676 | - $filter[] = array( |
|
| 676 | + $filter[ ] = array( |
|
| 677 | 677 | 'key' => $field_id, |
| 678 | 678 | 'value' => $val, |
| 679 | 679 | 'operator' => 'is', |
@@ -694,9 +694,9 @@ discard block |
||
| 694 | 694 | foreach ( $words as $word ) { |
| 695 | 695 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
| 696 | 696 | // Keep the same key for each filter |
| 697 | - $filter['value'] = $word; |
|
| 697 | + $filter[ 'value' ] = $word; |
|
| 698 | 698 | // Add a search for the value |
| 699 | - $filters[] = $filter; |
|
| 699 | + $filters[ ] = $filter; |
|
| 700 | 700 | } |
| 701 | 701 | } |
| 702 | 702 | |
@@ -723,19 +723,19 @@ discard block |
||
| 723 | 723 | * @since 1.16.3 |
| 724 | 724 | * Safeguard until GF implements '<=' operator |
| 725 | 725 | */ |
| 726 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 726 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 727 | 727 | $operator = '<'; |
| 728 | 728 | $date = date( 'Y-m-d', strtotime( $date . ' +1 day' ) ); |
| 729 | 729 | } |
| 730 | 730 | |
| 731 | - $filter[] = array( |
|
| 731 | + $filter[ ] = array( |
|
| 732 | 732 | 'key' => $field_id, |
| 733 | 733 | 'value' => self::get_formatted_date( $date, 'Y-m-d' ), |
| 734 | 734 | 'operator' => $operator, |
| 735 | 735 | ); |
| 736 | 736 | } |
| 737 | 737 | } else { |
| 738 | - $filter['value'] = self::get_formatted_date( $value, 'Y-m-d' ); |
|
| 738 | + $filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' ); |
|
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | break; |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | 'ymd_dot' => 'Y.m.d', |
| 767 | 767 | ); |
| 768 | 768 | |
| 769 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
| 769 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
| 770 | 770 | $format = $datepicker[ $field->dateFormat ]; |
| 771 | 771 | } |
| 772 | 772 | |
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | public function add_template_path( $file_paths ) { |
| 798 | 798 | |
| 799 | 799 | // Index 100 is the default GravityView template path. |
| 800 | - $file_paths[102] = self::$file . 'templates/'; |
|
| 800 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
| 801 | 801 | |
| 802 | 802 | return $file_paths; |
| 803 | 803 | } |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | $has_date = false; |
| 817 | 817 | |
| 818 | 818 | foreach ( $search_fields as $k => $field ) { |
| 819 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 819 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 820 | 820 | $has_date = true; |
| 821 | 821 | break; |
| 822 | 822 | } |
@@ -843,7 +843,7 @@ discard block |
||
| 843 | 843 | } |
| 844 | 844 | |
| 845 | 845 | // get configured search fields |
| 846 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
| 846 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
| 847 | 847 | |
| 848 | 848 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
| 849 | 849 | do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args ); |
@@ -858,34 +858,34 @@ discard block |
||
| 858 | 858 | |
| 859 | 859 | $updated_field = $this->get_search_filter_details( $updated_field ); |
| 860 | 860 | |
| 861 | - switch ( $field['field'] ) { |
|
| 861 | + switch ( $field[ 'field' ] ) { |
|
| 862 | 862 | |
| 863 | 863 | case 'search_all': |
| 864 | - $updated_field['key'] = 'search_all'; |
|
| 865 | - $updated_field['input'] = 'search_all'; |
|
| 866 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 864 | + $updated_field[ 'key' ] = 'search_all'; |
|
| 865 | + $updated_field[ 'input' ] = 'search_all'; |
|
| 866 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 867 | 867 | break; |
| 868 | 868 | |
| 869 | 869 | case 'entry_date': |
| 870 | - $updated_field['key'] = 'entry_date'; |
|
| 871 | - $updated_field['input'] = 'entry_date'; |
|
| 872 | - $updated_field['value'] = array( |
|
| 870 | + $updated_field[ 'key' ] = 'entry_date'; |
|
| 871 | + $updated_field[ 'input' ] = 'entry_date'; |
|
| 872 | + $updated_field[ 'value' ] = array( |
|
| 873 | 873 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
| 874 | 874 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
| 875 | 875 | ); |
| 876 | 876 | break; |
| 877 | 877 | |
| 878 | 878 | case 'entry_id': |
| 879 | - $updated_field['key'] = 'entry_id'; |
|
| 880 | - $updated_field['input'] = 'entry_id'; |
|
| 881 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 879 | + $updated_field[ 'key' ] = 'entry_id'; |
|
| 880 | + $updated_field[ 'input' ] = 'entry_id'; |
|
| 881 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 882 | 882 | break; |
| 883 | 883 | |
| 884 | 884 | case 'created_by': |
| 885 | - $updated_field['key'] = 'created_by'; |
|
| 886 | - $updated_field['name'] = 'gv_by'; |
|
| 887 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 888 | - $updated_field['choices'] = self::get_created_by_choices(); |
|
| 885 | + $updated_field[ 'key' ] = 'created_by'; |
|
| 886 | + $updated_field[ 'name' ] = 'gv_by'; |
|
| 887 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 888 | + $updated_field[ 'choices' ] = self::get_created_by_choices(); |
|
| 889 | 889 | break; |
| 890 | 890 | } |
| 891 | 891 | |
@@ -903,16 +903,16 @@ discard block |
||
| 903 | 903 | */ |
| 904 | 904 | $gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args ); |
| 905 | 905 | |
| 906 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
| 906 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
| 907 | 907 | |
| 908 | 908 | /** @since 1.14 */ |
| 909 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
| 909 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
| 910 | 910 | |
| 911 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
| 911 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
| 912 | 912 | |
| 913 | 913 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
| 914 | 914 | |
| 915 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
| 915 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
| 916 | 916 | |
| 917 | 917 | if ( $this->has_date_field( $search_fields ) ) { |
| 918 | 918 | // enqueue datepicker stuff only if needed! |
@@ -934,10 +934,10 @@ discard block |
||
| 934 | 934 | public static function get_search_class( $custom_class = '' ) { |
| 935 | 935 | $gravityview_view = GravityView_View::getInstance(); |
| 936 | 936 | |
| 937 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
| 937 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
| 938 | 938 | |
| 939 | - if ( ! empty( $custom_class ) ) { |
|
| 940 | - $search_class .= ' '.$custom_class; |
|
| 939 | + if ( ! empty( $custom_class ) ) { |
|
| 940 | + $search_class .= ' ' . $custom_class; |
|
| 941 | 941 | } |
| 942 | 942 | |
| 943 | 943 | /** |
@@ -979,11 +979,11 @@ discard block |
||
| 979 | 979 | |
| 980 | 980 | $label = rgget( 'label', $field ); |
| 981 | 981 | |
| 982 | - if( '' === $label ) { |
|
| 982 | + if ( '' === $label ) { |
|
| 983 | 983 | |
| 984 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
| 984 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
| 985 | 985 | |
| 986 | - switch( $field['field'] ) { |
|
| 986 | + switch ( $field[ 'field' ] ) { |
|
| 987 | 987 | case 'search_all': |
| 988 | 988 | $label = __( 'Search Entries:', 'gravityview' ); |
| 989 | 989 | break; |
@@ -995,10 +995,10 @@ discard block |
||
| 995 | 995 | break; |
| 996 | 996 | default: |
| 997 | 997 | // If this is a field input, not a field |
| 998 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
| 998 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
| 999 | 999 | |
| 1000 | 1000 | // Get the label for the field in question, which returns an array |
| 1001 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
| 1001 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
| 1002 | 1002 | |
| 1003 | 1003 | // Get the item with the `label` key |
| 1004 | 1004 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1037,32 +1037,32 @@ discard block |
||
| 1037 | 1037 | $form = $gravityview_view->getForm(); |
| 1038 | 1038 | |
| 1039 | 1039 | // for advanced field ids (eg, first name / last name ) |
| 1040 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
| 1040 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
| 1041 | 1041 | |
| 1042 | 1042 | // get searched value from $_GET/$_POST (string or array) |
| 1043 | 1043 | $value = $this->rgget_or_rgpost( $name ); |
| 1044 | 1044 | |
| 1045 | 1045 | // get form field details |
| 1046 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
| 1046 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
| 1047 | 1047 | |
| 1048 | 1048 | $filter = array( |
| 1049 | - 'key' => $field['field'], |
|
| 1049 | + 'key' => $field[ 'field' ], |
|
| 1050 | 1050 | 'name' => $name, |
| 1051 | 1051 | 'label' => self::get_field_label( $field, $form_field ), |
| 1052 | - 'input' => $field['input'], |
|
| 1052 | + 'input' => $field[ 'input' ], |
|
| 1053 | 1053 | 'value' => $value, |
| 1054 | - 'type' => $form_field['type'], |
|
| 1054 | + 'type' => $form_field[ 'type' ], |
|
| 1055 | 1055 | ); |
| 1056 | 1056 | |
| 1057 | 1057 | // collect choices |
| 1058 | - if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
| 1059 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
| 1060 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
| 1061 | - $filter['choices'] = $form_field['choices']; |
|
| 1058 | + if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
| 1059 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
| 1060 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
| 1061 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
| 1062 | 1062 | } |
| 1063 | 1063 | |
| 1064 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
| 1065 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
| 1064 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
| 1065 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | 1068 | return $filter; |
@@ -1086,7 +1086,7 @@ discard block |
||
| 1086 | 1086 | |
| 1087 | 1087 | $choices = array(); |
| 1088 | 1088 | foreach ( $users as $user ) { |
| 1089 | - $choices[] = array( |
|
| 1089 | + $choices[ ] = array( |
|
| 1090 | 1090 | 'value' => $user->ID, |
| 1091 | 1091 | 'text' => $user->display_name, |
| 1092 | 1092 | ); |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | */ |
| 1142 | 1142 | public function add_datepicker_js_dependency( $js_dependencies ) { |
| 1143 | 1143 | |
| 1144 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
| 1144 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
| 1145 | 1145 | |
| 1146 | 1146 | return $js_dependencies; |
| 1147 | 1147 | } |
@@ -1185,7 +1185,7 @@ discard block |
||
| 1185 | 1185 | 'isRTL' => is_rtl(), |
| 1186 | 1186 | ), $view_data ); |
| 1187 | 1187 | |
| 1188 | - $localizations['datepicker'] = $datepicker_settings; |
|
| 1188 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
| 1189 | 1189 | |
| 1190 | 1190 | return $localizations; |
| 1191 | 1191 | |
@@ -1214,7 +1214,7 @@ discard block |
||
| 1214 | 1214 | * @return void |
| 1215 | 1215 | */ |
| 1216 | 1216 | private function maybe_enqueue_flexibility() { |
| 1217 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
| 1217 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
| 1218 | 1218 | wp_enqueue_script( 'gv-flexibility' ); |
| 1219 | 1219 | } |
| 1220 | 1220 | } |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
| 1237 | 1237 | |
| 1238 | 1238 | $scheme = is_ssl() ? 'https://' : 'http://'; |
| 1239 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1239 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1240 | 1240 | |
| 1241 | 1241 | /** |
| 1242 | 1242 | * @filter `gravityview_search_datepicker_class` |