@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | var $is_searchable = true; |
| 16 | 16 | |
| 17 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
| 17 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
| 18 | 18 | |
| 19 | 19 | var $_gf_field_class_name = 'GF_Field_Post_Tags'; |
| 20 | 20 | |
@@ -27,12 +27,12 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 29 | 29 | |
| 30 | - if( 'edit' === $context ) { |
|
| 30 | + if ( 'edit' === $context ) { |
|
| 31 | 31 | return $field_options; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - $this->add_field_support('dynamic_data', $field_options ); |
|
| 35 | - $this->add_field_support('link_to_term', $field_options ); |
|
| 34 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
| 35 | + $this->add_field_support( 'link_to_term', $field_options ); |
|
| 36 | 36 | |
| 37 | 37 | return $field_options; |
| 38 | 38 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | public function edit_entry_fix_uid_fields( $fields ) { |
| 51 | 51 | |
| 52 | 52 | /** @var GF_Field $field */ |
| 53 | - foreach( $fields as &$field ) { |
|
| 53 | + foreach ( $fields as &$field ) { |
|
| 54 | 54 | if ( 'uid' === $field->type ) { |
| 55 | 55 | |
| 56 | 56 | // Replace GF_Field with GF_Field_Text, copying all the data from $field |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | $hide_coupon_fields = apply_filters( 'gravityview/edit_entry/hide-coupon-fields', $has_transaction_data ); |
| 55 | 55 | |
| 56 | - return (bool) $hide_coupon_fields; |
|
| 56 | + return (bool)$hide_coupon_fields; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | public function edit_entry_field_blacklist( $blacklist = array(), $entry = array() ) { |
| 70 | 70 | |
| 71 | 71 | if ( $this->should_hide_coupon_fields( $entry ) ) { |
| 72 | - $blacklist[] = 'coupon'; |
|
| 72 | + $blacklist[ ] = 'coupon'; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | return $blacklist; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | // No coupons match the codes provided |
| 108 | 108 | $discounts = gf_coupons()->get_coupons_by_codes( $coupon_codes, $form ); |
| 109 | 109 | |
| 110 | - if( ! $discounts ) { |
|
| 110 | + if ( ! $discounts ) { |
|
| 111 | 111 | return $value; |
| 112 | 112 | } |
| 113 | 113 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * @see GF_Field_Coupon::get_field_input |
| 117 | 117 | */ |
| 118 | 118 | $_POST = ! isset( $_POST ) ? array() : $_POST; |
| 119 | - $_POST[ 'gf_coupons_' . $form['id'] ] = json_encode( (array) $discounts ); |
|
| 119 | + $_POST[ 'gf_coupons_' . $form[ 'id' ] ] = json_encode( (array)$discounts ); |
|
| 120 | 120 | $_POST[ 'input_' . $field->id ] = implode( ',', $coupon_codes ); |
| 121 | 121 | |
| 122 | 122 | return $value; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | ?> |
| 14 | 14 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php |
| 15 | 15 | |
| 16 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; |
|
| 16 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; |
|
| 17 | 17 | |
| 18 | 18 | echo $this->get_tooltip() . $this->get_field_desc(); |
| 19 | 19 | |
@@ -26,14 +26,14 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | function render_input( $override_input = null ) { |
| 28 | 28 | |
| 29 | - if( isset( $override_input ) ) { |
|
| 29 | + if ( isset( $override_input ) ) { |
|
| 30 | 30 | echo $override_input; |
| 31 | 31 | return; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | ?> |
| 35 | 35 | <select name="<?php echo esc_attr( $this->name ); ?>[]" id="<?php echo $this->get_field_id(); ?>" multiple="multiple"> |
| 36 | - <?php foreach( $this->field['options'] as $value => $label ) : ?> |
|
| 36 | + <?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?> |
|
| 37 | 37 | <option value="<?php echo esc_attr( $value ); ?>" <?php selected( in_array( $value, (array)$this->value ), true, true ); ?>><?php echo esc_html( $label ); ?></option> |
| 38 | 38 | <?php endforeach; ?> |
| 39 | 39 | </select> |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
| 327 | - if( GFCommon::is_product_field( $field['type'] ) ){ |
|
| 327 | + if( GFCommon::is_product_field( $field['type'] ) ) { |
|
| 328 | 328 | $has_product_fields = true; |
| 329 | 329 | } |
| 330 | 330 | |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | $fields = array(); |
| 386 | 386 | |
| 387 | - foreach ( $extra_fields as $key => $field ){ |
|
| 387 | + foreach ( $extra_fields as $key => $field ) { |
|
| 388 | 388 | if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
| 389 | 389 | $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
| 390 | 390 | } |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | $form = GFAPI::get_form( $form ); |
| 979 | 979 | } |
| 980 | 980 | |
| 981 | - if ( class_exists( 'GFFormsModel' ) ){ |
|
| 981 | + if ( class_exists( 'GFFormsModel' ) ) { |
|
| 982 | 982 | return GFFormsModel::get_field( $form, $field_id ); |
| 983 | 983 | } else { |
| 984 | 984 | return null; |
@@ -1025,7 +1025,7 @@ discard block |
||
| 1025 | 1025 | $shortcodes = array(); |
| 1026 | 1026 | |
| 1027 | 1027 | preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
| 1028 | - if ( empty( $matches ) ){ |
|
| 1028 | + if ( empty( $matches ) ) { |
|
| 1029 | 1029 | return false; |
| 1030 | 1030 | } |
| 1031 | 1031 | |
@@ -305,12 +305,12 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | - * @hack |
|
| 309 | - * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 310 | - */ |
|
| 308 | + * @hack |
|
| 309 | + * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 310 | + */ |
|
| 311 | 311 | if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
| 312 | - continue; |
|
| 313 | - } |
|
| 312 | + continue; |
|
| 313 | + } |
|
| 314 | 314 | $fields["{$input['id']}"] = array( |
| 315 | 315 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 316 | 316 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
@@ -1349,7 +1349,7 @@ discard block |
||
| 1349 | 1349 | ), |
| 1350 | 1350 | ); |
| 1351 | 1351 | |
| 1352 | - $fields = $date_created + $fields; |
|
| 1352 | + $fields = $date_created + $fields; |
|
| 1353 | 1353 | |
| 1354 | 1354 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1355 | 1355 | |
@@ -1361,13 +1361,13 @@ discard block |
||
| 1361 | 1361 | } |
| 1362 | 1362 | } |
| 1363 | 1363 | |
| 1364 | - /** |
|
| 1365 | - * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1366 | - * @since 1.12 |
|
| 1367 | - * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1368 | - * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1369 | - */ |
|
| 1370 | - $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1364 | + /** |
|
| 1365 | + * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1366 | + * @since 1.12 |
|
| 1367 | + * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1368 | + * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1369 | + */ |
|
| 1370 | + $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1371 | 1371 | |
| 1372 | 1372 | return $fields; |
| 1373 | 1373 | } |
@@ -1659,26 +1659,26 @@ discard block |
||
| 1659 | 1659 | } |
| 1660 | 1660 | |
| 1661 | 1661 | |
| 1662 | - /** |
|
| 1663 | - * Display updated/error notice |
|
| 1664 | - * |
|
| 1665 | - * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1666 | - * |
|
| 1667 | - * @param string $notice text/HTML of notice |
|
| 1668 | - * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1669 | - * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1670 | - * |
|
| 1671 | - * @return string |
|
| 1672 | - */ |
|
| 1673 | - public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1674 | - |
|
| 1675 | - // If $cap is defined, only show notice if user has capability |
|
| 1676 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1677 | - return ''; |
|
| 1678 | - } |
|
| 1679 | - |
|
| 1680 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1681 | - } |
|
| 1662 | + /** |
|
| 1663 | + * Display updated/error notice |
|
| 1664 | + * |
|
| 1665 | + * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1666 | + * |
|
| 1667 | + * @param string $notice text/HTML of notice |
|
| 1668 | + * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1669 | + * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1670 | + * |
|
| 1671 | + * @return string |
|
| 1672 | + */ |
|
| 1673 | + public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1674 | + |
|
| 1675 | + // If $cap is defined, only show notice if user has capability |
|
| 1676 | + if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1677 | + return ''; |
|
| 1678 | + } |
|
| 1679 | + |
|
| 1680 | + return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1681 | + } |
|
| 1682 | 1682 | |
| 1683 | 1683 | /** |
| 1684 | 1684 | * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * Return array of fields' id and label, for a given Form ID |
| 271 | 271 | * |
| 272 | 272 | * @access public |
| 273 | - * @param string|array $form_id (default: '') or $form object |
|
| 273 | + * @param string|array $form (default: '') or $form object |
|
| 274 | 274 | * @param bool $add_default_properties |
| 275 | 275 | * @param bool $include_parent_field |
| 276 | 276 | * @return array |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | * |
| 1013 | 1013 | * @param array $form Gravity Forms form array |
| 1014 | 1014 | * @param string $field_id ID of the field. If an input, full input ID (like `1.3`) |
| 1015 | - * @param string|array $field_value Raw value of the field. |
|
| 1015 | + * @param string $field_value Raw value of the field. |
|
| 1016 | 1016 | * @return string |
| 1017 | 1017 | */ |
| 1018 | 1018 | public static function get_field_label( $form = array(), $field_id = '', $field_value = '' ) { |
@@ -1515,7 +1515,7 @@ discard block |
||
| 1515 | 1515 | * |
| 1516 | 1516 | * Do the same than parse_str without max_input_vars limitation: |
| 1517 | 1517 | * Parses $string as if it were the query string passed via a URL and sets variables in the current scope. |
| 1518 | - * @param $string string string to parse (not altered like in the original parse_str(), use the second parameter!) |
|
| 1518 | + * @param string $string string string to parse (not altered like in the original parse_str(), use the second parameter!) |
|
| 1519 | 1519 | * @param $result array If the second parameter is present, variables are stored in this variable as array elements |
| 1520 | 1520 | * @return bool true or false if $string is an empty string |
| 1521 | 1521 | * @since 1.5.3 |
@@ -1750,9 +1750,9 @@ discard block |
||
| 1750 | 1750 | * @param string $message Message body (required) |
| 1751 | 1751 | * @param string $from_name Displayed name of the sender |
| 1752 | 1752 | * @param string $message_format If "html", sent text as `text/html`. Otherwise, `text/plain`. Default: "html". |
| 1753 | - * @param string|array $attachments Optional. Files to attach. {@see wp_mail()} for usage. Default: "". |
|
| 1753 | + * @param string $attachments Optional. Files to attach. {@see wp_mail()} for usage. Default: "". |
|
| 1754 | 1754 | * @param array|false $entry Gravity Forms entry array, related to the email. Default: false. |
| 1755 | - * @param array|false $notification Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false. |
|
| 1755 | + * @param boolean $notification Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false. |
|
| 1756 | 1756 | */ |
| 1757 | 1757 | public static function send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name = '', $message_format = 'html', $attachments = '', $entry = false, $notification = false ) { |
| 1758 | 1758 | |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $form = false; |
| 127 | 127 | |
| 128 | - if( $entry ) { |
|
| 129 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
| 128 | + if ( $entry ) { |
|
| 129 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | return $form; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - return (bool) $has_transaction_data; |
|
| 205 | + return (bool)$has_transaction_data; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | |
| 241 | 241 | $results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging ); |
| 242 | 242 | |
| 243 | - $result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null; |
|
| 243 | + $result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null; |
|
| 244 | 244 | |
| 245 | 245 | return $result; |
| 246 | 246 | } |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | * |
| 258 | 258 | * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms |
| 259 | 259 | */ |
| 260 | - public static function get_forms( $active = true, $trash = false ) { |
|
| 260 | + public static function get_forms( $active = true, $trash = false ) { |
|
| 261 | 261 | $forms = array(); |
| 262 | 262 | if ( class_exists( 'GFAPI' ) ) { |
| 263 | - if( 'any' === $active ) { |
|
| 263 | + if ( 'any' === $active ) { |
|
| 264 | 264 | $active_forms = GFAPI::get_forms( true, $trash ); |
| 265 | 265 | $inactive_forms = GFAPI::get_forms( false, $trash ); |
| 266 | 266 | $forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) ); |
@@ -291,9 +291,9 @@ discard block |
||
| 291 | 291 | $has_post_fields = false; |
| 292 | 292 | |
| 293 | 293 | if ( $form ) { |
| 294 | - foreach ( $form['fields'] as $field ) { |
|
| 295 | - if ( $include_parent_field || empty( $field['inputs'] ) ) { |
|
| 296 | - $fields["{$field['id']}"] = array( |
|
| 294 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 295 | + if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) { |
|
| 296 | + $fields[ "{$field[ 'id' ]}" ] = array( |
|
| 297 | 297 | 'label' => \GV\Utils::get( $field, 'label' ), |
| 298 | 298 | 'parent' => null, |
| 299 | 299 | 'type' => \GV\Utils::get( $field, 'type' ), |
@@ -302,10 +302,10 @@ discard block |
||
| 302 | 302 | ); |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | - if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
|
| 306 | - foreach ( $field['inputs'] as $input ) { |
|
| 305 | + if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) { |
|
| 306 | + foreach ( $field[ 'inputs' ] as $input ) { |
|
| 307 | 307 | |
| 308 | - if( ! empty( $input['isHidden'] ) ) { |
|
| 308 | + if ( ! empty( $input[ 'isHidden' ] ) ) { |
|
| 309 | 309 | continue; |
| 310 | 310 | } |
| 311 | 311 | |
@@ -313,10 +313,10 @@ discard block |
||
| 313 | 313 | * @hack |
| 314 | 314 | * In case of email/email confirmation, the input for email has the same id as the parent field |
| 315 | 315 | */ |
| 316 | - if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
|
| 316 | + if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) { |
|
| 317 | 317 | continue; |
| 318 | 318 | } |
| 319 | - $fields["{$input['id']}"] = array( |
|
| 319 | + $fields[ "{$input[ 'id' ]}" ] = array( |
|
| 320 | 320 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 321 | 321 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
| 322 | 322 | 'parent' => $field, |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | |
| 331 | - if( GFCommon::is_product_field( $field['type'] ) ){ |
|
| 331 | + if ( GFCommon::is_product_field( $field[ 'type' ] ) ) { |
|
| 332 | 332 | $has_product_fields = true; |
| 333 | 333 | } |
| 334 | 334 | |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | * @since 1.7 |
| 343 | 343 | */ |
| 344 | 344 | if ( $has_post_fields ) { |
| 345 | - $fields['post_id'] = array( |
|
| 345 | + $fields[ 'post_id' ] = array( |
|
| 346 | 346 | 'label' => __( 'Post ID', 'gravityview' ), |
| 347 | 347 | 'type' => 'post_id', |
| 348 | 348 | ); |
@@ -355,11 +355,11 @@ discard block |
||
| 355 | 355 | foreach ( $payment_fields as $payment_field ) { |
| 356 | 356 | |
| 357 | 357 | // Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key |
| 358 | - if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 358 | + if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 359 | 359 | continue; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $fields["{$payment_field->name}"] = array( |
|
| 362 | + $fields[ "{$payment_field->name}" ] = array( |
|
| 363 | 363 | 'label' => $payment_field->label, |
| 364 | 364 | 'desc' => $payment_field->description, |
| 365 | 365 | 'type' => $payment_field->name, |
@@ -391,9 +391,9 @@ discard block |
||
| 391 | 391 | |
| 392 | 392 | $fields = array(); |
| 393 | 393 | |
| 394 | - foreach ( $extra_fields as $key => $field ){ |
|
| 395 | - if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
|
| 396 | - $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
|
| 394 | + foreach ( $extra_fields as $key => $field ) { |
|
| 395 | + if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) { |
|
| 396 | + $fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' ); |
|
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | |
@@ -433,33 +433,33 @@ discard block |
||
| 433 | 433 | 'search_criteria' => null, |
| 434 | 434 | 'sorting' => null, |
| 435 | 435 | 'paging' => null, |
| 436 | - 'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true), |
|
| 436 | + 'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ), |
|
| 437 | 437 | 'context_view_id' => null, |
| 438 | 438 | ); |
| 439 | 439 | |
| 440 | 440 | $criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults ); |
| 441 | 441 | |
| 442 | - if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) { |
|
| 443 | - foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) { |
|
| 442 | + if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 443 | + foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) { |
|
| 444 | 444 | |
| 445 | 445 | if ( ! is_array( $filter ) ) { |
| 446 | 446 | continue; |
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | // By default, we want searches to be wildcard for each field. |
| 450 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 450 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 451 | 451 | |
| 452 | 452 | /** |
| 453 | 453 | * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc) |
| 454 | 454 | * @param string $operator Existing search operator |
| 455 | 455 | * @param array $filter array with `key`, `value`, `operator`, `type` keys |
| 456 | 456 | */ |
| 457 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter ); |
|
| 457 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter ); |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | // don't send just the [mode] without any field filter. |
| 461 | - if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) { |
|
| 462 | - unset( $criteria['search_criteria']['field_filters']['mode'] ); |
|
| 461 | + if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 462 | + unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] ); |
|
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | } |
@@ -470,33 +470,33 @@ discard block |
||
| 470 | 470 | * Prepare date formats to be in Gravity Forms DB format; |
| 471 | 471 | * $passed_criteria may include date formats incompatible with Gravity Forms. |
| 472 | 472 | */ |
| 473 | - foreach ( array('start_date', 'end_date' ) as $key ) { |
|
| 473 | + foreach ( array( 'start_date', 'end_date' ) as $key ) { |
|
| 474 | 474 | |
| 475 | - if ( ! empty( $criteria['search_criteria'][ $key ] ) ) { |
|
| 475 | + if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) { |
|
| 476 | 476 | |
| 477 | 477 | // Use date_create instead of new DateTime so it returns false if invalid date format. |
| 478 | - $date = date_create( $criteria['search_criteria'][ $key ] ); |
|
| 478 | + $date = date_create( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 479 | 479 | |
| 480 | 480 | if ( $date ) { |
| 481 | 481 | // Gravity Forms wants dates in the `Y-m-d H:i:s` format. |
| 482 | - $criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 482 | + $criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 483 | 483 | } else { |
| 484 | - gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) ); |
|
| 484 | + gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) ); |
|
| 485 | 485 | |
| 486 | 486 | // If it's an invalid date, unset it. Gravity Forms freaks out otherwise. |
| 487 | - unset( $criteria['search_criteria'][ $key ] ); |
|
| 487 | + unset( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | } |
| 491 | 491 | |
| 492 | - if ( empty( $criteria['context_view_id'] ) ) { |
|
| 492 | + if ( empty( $criteria[ 'context_view_id' ] ) ) { |
|
| 493 | 493 | // Calculate the context view id and send it to the advanced filter |
| 494 | 494 | if ( GravityView_frontend::getInstance()->getSingleEntry() ) { |
| 495 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 495 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 496 | 496 | } else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) { |
| 497 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 497 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 498 | 498 | } else if ( 'delete' === GFForms::get( 'action' ) ) { |
| 499 | - $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null; |
|
| 499 | + $criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null; |
|
| 500 | 500 | } |
| 501 | 501 | } |
| 502 | 502 | |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | * @param array $form_ids Forms to search |
| 507 | 507 | * @param int $view_id ID of the view being used to search |
| 508 | 508 | */ |
| 509 | - $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] ); |
|
| 509 | + $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] ); |
|
| 510 | 510 | |
| 511 | 511 | return (array)$criteria; |
| 512 | 512 | } |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | /** Reduce # of database calls */ |
| 542 | 542 | add_filter( 'gform_is_encrypted_field', '__return_false' ); |
| 543 | 543 | |
| 544 | - if ( ! empty( $criteria['cache'] ) ) { |
|
| 544 | + if ( ! empty( $criteria[ 'cache' ] ) ) { |
|
| 545 | 545 | |
| 546 | 546 | $Cache = new GravityView_Cache( $form_ids, $criteria ); |
| 547 | 547 | |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | |
| 550 | 550 | // Still update the total count when using cached results |
| 551 | 551 | if ( ! is_null( $total ) ) { |
| 552 | - $total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] ); |
|
| 552 | + $total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] ); |
|
| 553 | 553 | } |
| 554 | 554 | |
| 555 | 555 | $return = $entries; |
@@ -571,9 +571,9 @@ discard block |
||
| 571 | 571 | $entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) ); |
| 572 | 572 | |
| 573 | 573 | // No entries returned from gravityview_before_get_entries |
| 574 | - if( is_null( $entries ) ) { |
|
| 574 | + if ( is_null( $entries ) ) { |
|
| 575 | 575 | |
| 576 | - $entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total ); |
|
| 576 | + $entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total ); |
|
| 577 | 577 | |
| 578 | 578 | if ( is_wp_error( $entries ) ) { |
| 579 | 579 | gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) ); |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | } |
| 586 | 586 | |
| 587 | - if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) { |
|
| 587 | + if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) { |
|
| 588 | 588 | |
| 589 | 589 | // Cache results |
| 590 | 590 | $Cache->set( $entries, 'entries' ); |
@@ -693,12 +693,12 @@ discard block |
||
| 693 | 693 | */ |
| 694 | 694 | $check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry ); |
| 695 | 695 | |
| 696 | - if( $check_entry_display ) { |
|
| 696 | + if ( $check_entry_display ) { |
|
| 697 | 697 | // Is the entry allowed |
| 698 | 698 | $entry = self::check_entry_display( $entry ); |
| 699 | 699 | } |
| 700 | 700 | |
| 701 | - if( is_wp_error( $entry ) ) { |
|
| 701 | + if ( is_wp_error( $entry ) ) { |
|
| 702 | 702 | gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) ); |
| 703 | 703 | return false; |
| 704 | 704 | } |
@@ -732,12 +732,12 @@ discard block |
||
| 732 | 732 | |
| 733 | 733 | $value = false; |
| 734 | 734 | |
| 735 | - if( 'context' === $val1 ) { |
|
| 735 | + if ( 'context' === $val1 ) { |
|
| 736 | 736 | |
| 737 | 737 | $matching_contexts = array( $val2 ); |
| 738 | 738 | |
| 739 | 739 | // We allow for non-standard contexts. |
| 740 | - switch( $val2 ) { |
|
| 740 | + switch ( $val2 ) { |
|
| 741 | 741 | // Check for either single or edit |
| 742 | 742 | case 'singular': |
| 743 | 743 | $matching_contexts = array( 'single', 'edit' ); |
@@ -780,18 +780,18 @@ discard block |
||
| 780 | 780 | $json_val_1 = json_decode( $val1, true ); |
| 781 | 781 | $json_val_2 = json_decode( $val2, true ); |
| 782 | 782 | |
| 783 | - if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 783 | + if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 784 | 784 | |
| 785 | 785 | $json_in = false; |
| 786 | - $json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 ); |
|
| 787 | - $json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 ); |
|
| 786 | + $json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 ); |
|
| 787 | + $json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 ); |
|
| 788 | 788 | |
| 789 | 789 | // For JSON, we want to compare as "in" or "not in" rather than "contains" |
| 790 | 790 | foreach ( $json_val_1 as $item_1 ) { |
| 791 | 791 | foreach ( $json_val_2 as $item_2 ) { |
| 792 | 792 | $json_in = self::matches_operation( $item_1, $item_2, 'is' ); |
| 793 | 793 | |
| 794 | - if( $json_in ) { |
|
| 794 | + if ( $json_in ) { |
|
| 795 | 795 | break 2; |
| 796 | 796 | } |
| 797 | 797 | } |
@@ -843,10 +843,10 @@ discard block |
||
| 843 | 843 | public static function check_entry_display( $entry, $view = null ) { |
| 844 | 844 | |
| 845 | 845 | if ( ! $entry || is_wp_error( $entry ) ) { |
| 846 | - return new WP_Error('entry_not_found', 'Entry was not found.', $entry ); |
|
| 846 | + return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry ); |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | - if ( empty( $entry['form_id'] ) ) { |
|
| 849 | + if ( empty( $entry[ 'form_id' ] ) ) { |
|
| 850 | 850 | return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry ); |
| 851 | 851 | } |
| 852 | 852 | |
@@ -855,12 +855,12 @@ discard block |
||
| 855 | 855 | * Check whether the entry is in the entries subset by running a modified query. |
| 856 | 856 | */ |
| 857 | 857 | add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry ) { |
| 858 | - $_tmp_query = new \GF_Query( $view->form->ID, array( 'field_filters' => array( 'mode' => 'all', array( 'key' => 'id', 'operation' => 'is', 'value' => $entry['id'] ) ) ) ); |
|
| 858 | + $_tmp_query = new \GF_Query( $view->form->ID, array( 'field_filters' => array( 'mode' => 'all', array( 'key' => 'id', 'operation' => 'is', 'value' => $entry[ 'id' ] ) ) ) ); |
|
| 859 | 859 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 860 | 860 | |
| 861 | 861 | $query_parts = $query->_introspect(); |
| 862 | 862 | |
| 863 | - $query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) ); |
|
| 863 | + $query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) ); |
|
| 864 | 864 | }, 10, 3 ); |
| 865 | 865 | |
| 866 | 866 | $entries = $view->get_entries()->all(); |
@@ -871,20 +871,20 @@ discard block |
||
| 871 | 871 | } |
| 872 | 872 | |
| 873 | 873 | // This entry is on a View with joins |
| 874 | - if( $entries[0] instanceof \GV\Multi_Entry ) { |
|
| 874 | + if ( $entries[ 0 ] instanceof \GV\Multi_Entry ) { |
|
| 875 | 875 | |
| 876 | 876 | $multi_entry_ids = array(); |
| 877 | 877 | |
| 878 | - foreach ( $entries[0]->entries as $multi_entry ) { |
|
| 879 | - $multi_entry_ids[] = (int) $multi_entry->ID; |
|
| 878 | + foreach ( $entries[ 0 ]->entries as $multi_entry ) { |
|
| 879 | + $multi_entry_ids[ ] = (int)$multi_entry->ID; |
|
| 880 | 880 | } |
| 881 | 881 | |
| 882 | - if( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) { |
|
| 882 | + if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) { |
|
| 883 | 883 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 884 | 884 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 885 | 885 | } |
| 886 | 886 | |
| 887 | - } elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) { |
|
| 887 | + } elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) { |
|
| 888 | 888 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 889 | 889 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 890 | 890 | } |
@@ -897,59 +897,59 @@ discard block |
||
| 897 | 897 | 'context_view_id' => $view ? $view->ID : null, |
| 898 | 898 | ) ); |
| 899 | 899 | |
| 900 | - if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) { |
|
| 900 | + if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) { |
|
| 901 | 901 | gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) ); |
| 902 | 902 | return $entry; |
| 903 | 903 | } |
| 904 | 904 | |
| 905 | 905 | // Make sure the current View is connected to the same form as the Entry |
| 906 | - if( ! empty( $criteria['context_view_id'] ) ) { |
|
| 907 | - $context_view_id = intval( $criteria['context_view_id'] ); |
|
| 906 | + if ( ! empty( $criteria[ 'context_view_id' ] ) ) { |
|
| 907 | + $context_view_id = intval( $criteria[ 'context_view_id' ] ); |
|
| 908 | 908 | $context_form_id = gravityview_get_form_id( $context_view_id ); |
| 909 | - if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) { |
|
| 910 | - return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] ); |
|
| 909 | + if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) { |
|
| 910 | + return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] ); |
|
| 911 | 911 | } |
| 912 | 912 | } |
| 913 | 913 | |
| 914 | - $search_criteria = $criteria['search_criteria']; |
|
| 914 | + $search_criteria = $criteria[ 'search_criteria' ]; |
|
| 915 | 915 | |
| 916 | 916 | // check entry status |
| 917 | - if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) { |
|
| 918 | - return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria ); |
|
| 917 | + if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) { |
|
| 918 | + return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria ); |
|
| 919 | 919 | } |
| 920 | 920 | |
| 921 | 921 | // check entry date |
| 922 | 922 | // @todo: Does it make sense to apply the Date create filters to the single entry? |
| 923 | 923 | |
| 924 | 924 | // field_filters |
| 925 | - if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) { |
|
| 925 | + if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) { |
|
| 926 | 926 | gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) ); |
| 927 | 927 | return $entry; |
| 928 | 928 | } |
| 929 | 929 | |
| 930 | - $filters = $search_criteria['field_filters']; |
|
| 930 | + $filters = $search_criteria[ 'field_filters' ]; |
|
| 931 | 931 | |
| 932 | - $mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all'; |
|
| 932 | + $mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all'; |
|
| 933 | 933 | |
| 934 | - $mode = $mode ? : 'all'; // If mode is an empty string, assume it's 'all' |
|
| 934 | + $mode = $mode ?: 'all'; // If mode is an empty string, assume it's 'all' |
|
| 935 | 935 | |
| 936 | 936 | // Prevent the mode from being processed below |
| 937 | - unset( $filters['mode'] ); |
|
| 937 | + unset( $filters[ 'mode' ] ); |
|
| 938 | 938 | |
| 939 | - $form = self::get_form( $entry['form_id'] ); |
|
| 939 | + $form = self::get_form( $entry[ 'form_id' ] ); |
|
| 940 | 940 | |
| 941 | 941 | foreach ( $filters as $filter ) { |
| 942 | - $operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is'; |
|
| 942 | + $operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is'; |
|
| 943 | 943 | |
| 944 | - if ( ! isset( $filter['key'] ) ) { |
|
| 944 | + if ( ! isset( $filter[ 'key' ] ) ) { |
|
| 945 | 945 | gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set, any field mode', array( 'filter' => $filter ) ); |
| 946 | 946 | /** |
| 947 | 947 | * This is a cross-field search. Let's start digging'. |
| 948 | 948 | */ |
| 949 | 949 | foreach ( \GV\Utils::get( $form, 'fields', array() ) as $field ) { |
| 950 | 950 | $field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
| 951 | - if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ) ) { |
|
| 952 | - if ( 'any' === $mode) { |
|
| 951 | + if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ) ) { |
|
| 952 | + if ( 'any' === $mode ) { |
|
| 953 | 953 | return $entry; // All good here |
| 954 | 954 | } // mode === 'all' |
| 955 | 955 | continue 2; // Next filter |
@@ -958,13 +958,13 @@ discard block |
||
| 958 | 958 | } |
| 959 | 959 | |
| 960 | 960 | if ( 'all' === $mode ) { |
| 961 | - return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter ); |
|
| 961 | + return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter ); |
|
| 962 | 962 | } |
| 963 | 963 | |
| 964 | 964 | continue; |
| 965 | 965 | } |
| 966 | 966 | |
| 967 | - $k = $filter['key']; |
|
| 967 | + $k = $filter[ 'key' ]; |
|
| 968 | 968 | |
| 969 | 969 | $field = self::get_field( $form, $k ); |
| 970 | 970 | |
@@ -972,12 +972,12 @@ discard block |
||
| 972 | 972 | $field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null; |
| 973 | 973 | $field = $k; |
| 974 | 974 | } else { |
| 975 | - $field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
|
| 975 | + $field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
|
| 976 | 976 | // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it |
| 977 | 977 | $field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value; |
| 978 | 978 | } |
| 979 | 979 | |
| 980 | - $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ); |
|
| 980 | + $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ); |
|
| 981 | 981 | |
| 982 | 982 | // Any match is all we need to know |
| 983 | 983 | if ( $is_value_match && 'any' === $mode ) { |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | |
| 987 | 987 | // Any failed match is a total fail |
| 988 | 988 | if ( ! $is_value_match && 'all' === $mode ) { |
| 989 | - return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter ); |
|
| 989 | + return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter ); |
|
| 990 | 990 | } |
| 991 | 991 | } |
| 992 | 992 | |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' ); |
| 997 | 997 | return $entry; |
| 998 | 998 | } else { |
| 999 | - return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters ); |
|
| 999 | + return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters ); |
|
| 1000 | 1000 | } |
| 1001 | 1001 | |
| 1002 | 1002 | } |
@@ -1037,18 +1037,18 @@ discard block |
||
| 1037 | 1037 | * Gravity Forms code to adjust date to locally-configured Time Zone |
| 1038 | 1038 | * @see GFCommon::format_date() for original code |
| 1039 | 1039 | */ |
| 1040 | - $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 1040 | + $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 1041 | 1041 | $date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time ); |
| 1042 | 1042 | |
| 1043 | - $format = \GV\Utils::get( $atts, 'format' ); |
|
| 1044 | - $is_human = ! empty( $atts['human'] ); |
|
| 1045 | - $is_diff = ! empty( $atts['diff'] ); |
|
| 1046 | - $is_raw = ! empty( $atts['raw'] ); |
|
| 1047 | - $is_timestamp = ! empty( $atts['timestamp'] ); |
|
| 1048 | - $include_time = ! empty( $atts['time'] ); |
|
| 1043 | + $format = \GV\Utils::get( $atts, 'format' ); |
|
| 1044 | + $is_human = ! empty( $atts[ 'human' ] ); |
|
| 1045 | + $is_diff = ! empty( $atts[ 'diff' ] ); |
|
| 1046 | + $is_raw = ! empty( $atts[ 'raw' ] ); |
|
| 1047 | + $is_timestamp = ! empty( $atts[ 'timestamp' ] ); |
|
| 1048 | + $include_time = ! empty( $atts[ 'time' ] ); |
|
| 1049 | 1049 | |
| 1050 | 1050 | // If we're using time diff, we want to have a different default format |
| 1051 | - if( empty( $format ) ) { |
|
| 1051 | + if ( empty( $format ) ) { |
|
| 1052 | 1052 | /* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */ |
| 1053 | 1053 | $format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' ); |
| 1054 | 1054 | } |
@@ -1056,7 +1056,7 @@ discard block |
||
| 1056 | 1056 | // If raw was specified, don't modify the stored value |
| 1057 | 1057 | if ( $is_raw ) { |
| 1058 | 1058 | $formatted_date = $date_string; |
| 1059 | - } elseif( $is_timestamp ) { |
|
| 1059 | + } elseif ( $is_timestamp ) { |
|
| 1060 | 1060 | $formatted_date = $date_local_timestamp; |
| 1061 | 1061 | } elseif ( $is_diff ) { |
| 1062 | 1062 | $formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) ); |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | |
| 1091 | 1091 | $label = \GV\Utils::get( $field, 'label' ); |
| 1092 | 1092 | |
| 1093 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1093 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1094 | 1094 | $label = GFFormsModel::get_choice_text( $field, $field_value, $field_id ); |
| 1095 | 1095 | } |
| 1096 | 1096 | |
@@ -1118,7 +1118,7 @@ discard block |
||
| 1118 | 1118 | $form = GFAPI::get_form( $form ); |
| 1119 | 1119 | } |
| 1120 | 1120 | |
| 1121 | - if ( class_exists( 'GFFormsModel' ) ){ |
|
| 1121 | + if ( class_exists( 'GFFormsModel' ) ) { |
|
| 1122 | 1122 | return GFFormsModel::get_field( $form, $field_id ); |
| 1123 | 1123 | } else { |
| 1124 | 1124 | return null; |
@@ -1165,19 +1165,19 @@ discard block |
||
| 1165 | 1165 | $shortcodes = array(); |
| 1166 | 1166 | |
| 1167 | 1167 | preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
| 1168 | - if ( empty( $matches ) ){ |
|
| 1168 | + if ( empty( $matches ) ) { |
|
| 1169 | 1169 | return false; |
| 1170 | 1170 | } |
| 1171 | 1171 | |
| 1172 | 1172 | foreach ( $matches as $shortcode ) { |
| 1173 | - if ( $tag === $shortcode[2] ) { |
|
| 1173 | + if ( $tag === $shortcode[ 2 ] ) { |
|
| 1174 | 1174 | |
| 1175 | 1175 | // Changed this to $shortcode instead of true so we get the parsed atts. |
| 1176 | - $shortcodes[] = $shortcode; |
|
| 1176 | + $shortcodes[ ] = $shortcode; |
|
| 1177 | 1177 | |
| 1178 | - } else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) { |
|
| 1179 | - foreach( $results as $result ) { |
|
| 1180 | - $shortcodes[] = $result; |
|
| 1178 | + } else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) { |
|
| 1179 | + foreach ( $results as $result ) { |
|
| 1180 | + $shortcodes[ ] = $result; |
|
| 1181 | 1181 | } |
| 1182 | 1182 | } |
| 1183 | 1183 | } |
@@ -1209,7 +1209,7 @@ discard block |
||
| 1209 | 1209 | 'post_type' => 'gravityview', |
| 1210 | 1210 | 'posts_per_page' => 100, |
| 1211 | 1211 | 'meta_key' => '_gravityview_form_id', |
| 1212 | - 'meta_value' => (int) $form_id, |
|
| 1212 | + 'meta_value' => (int)$form_id, |
|
| 1213 | 1213 | ); |
| 1214 | 1214 | $args = wp_parse_args( $args, $defaults ); |
| 1215 | 1215 | $views = get_posts( $args ); |
@@ -1221,21 +1221,21 @@ discard block |
||
| 1221 | 1221 | |
| 1222 | 1222 | $data = unserialize( $view->meta_value ); |
| 1223 | 1223 | |
| 1224 | - if( ! $data || ! is_array( $data ) ) { |
|
| 1224 | + if ( ! $data || ! is_array( $data ) ) { |
|
| 1225 | 1225 | continue; |
| 1226 | 1226 | } |
| 1227 | 1227 | |
| 1228 | 1228 | foreach ( $data as $datum ) { |
| 1229 | - if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) { |
|
| 1230 | - $joined_forms[] = $view->post_id; |
|
| 1229 | + if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) { |
|
| 1230 | + $joined_forms[ ] = $view->post_id; |
|
| 1231 | 1231 | } |
| 1232 | 1232 | } |
| 1233 | 1233 | } |
| 1234 | 1234 | |
| 1235 | 1235 | if ( $joined_forms ) { |
| 1236 | - $joined_args = array( |
|
| 1236 | + $joined_args = array( |
|
| 1237 | 1237 | 'post_type' => 'gravityview', |
| 1238 | - 'posts_per_page' => $args['posts_per_page'], |
|
| 1238 | + 'posts_per_page' => $args[ 'posts_per_page' ], |
|
| 1239 | 1239 | 'post__in' => $joined_forms, |
| 1240 | 1240 | ); |
| 1241 | 1241 | $views = array_merge( $views, get_posts( $joined_args ) ); |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | |
| 1392 | 1392 | $directory_widgets = wp_parse_args( $view_widgets, $defaults ); |
| 1393 | 1393 | |
| 1394 | - if( $json_decode ) { |
|
| 1394 | + if ( $json_decode ) { |
|
| 1395 | 1395 | $directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' ); |
| 1396 | 1396 | } |
| 1397 | 1397 | |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | * @return string html |
| 1408 | 1408 | */ |
| 1409 | 1409 | public static function get_sortable_fields( $formid, $current = '' ) { |
| 1410 | - $output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>'; |
|
| 1410 | + $output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>'; |
|
| 1411 | 1411 | |
| 1412 | 1412 | if ( empty( $formid ) ) { |
| 1413 | 1413 | return $output; |
@@ -1420,11 +1420,11 @@ discard block |
||
| 1420 | 1420 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null ); |
| 1421 | 1421 | |
| 1422 | 1422 | foreach ( $fields as $id => $field ) { |
| 1423 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 1423 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 1424 | 1424 | continue; |
| 1425 | 1425 | } |
| 1426 | 1426 | |
| 1427 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>'; |
|
| 1427 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>'; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | } |
| 1430 | 1430 | |
@@ -1459,9 +1459,9 @@ discard block |
||
| 1459 | 1459 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1460 | 1460 | |
| 1461 | 1461 | // TODO: Convert to using array_filter |
| 1462 | - foreach( $fields as $id => $field ) { |
|
| 1462 | + foreach ( $fields as $id => $field ) { |
|
| 1463 | 1463 | |
| 1464 | - if( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 1464 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 1465 | 1465 | unset( $fields[ $id ] ); |
| 1466 | 1466 | } |
| 1467 | 1467 | } |
@@ -1502,14 +1502,14 @@ discard block |
||
| 1502 | 1502 | * @param int|array $field field key or field array |
| 1503 | 1503 | * @return boolean |
| 1504 | 1504 | */ |
| 1505 | - public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1505 | + public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1506 | 1506 | |
| 1507 | 1507 | if ( ! is_array( $form ) && ! is_array( $field ) ) { |
| 1508 | 1508 | $form = self::get_form( $form ); |
| 1509 | 1509 | } |
| 1510 | 1510 | |
| 1511 | 1511 | // If entry meta, it's a string. Otherwise, numeric |
| 1512 | - if( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1512 | + if ( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1513 | 1513 | $type = $field; |
| 1514 | 1514 | } else { |
| 1515 | 1515 | $type = self::get_field_type( $form, $field ); |
@@ -1523,9 +1523,9 @@ discard block |
||
| 1523 | 1523 | $numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) ); |
| 1524 | 1524 | |
| 1525 | 1525 | // Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true |
| 1526 | - if( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1527 | - if( true === $gv_field->is_numeric ) { |
|
| 1528 | - $numeric_types[] = $gv_field->is_numeric; |
|
| 1526 | + if ( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1527 | + if ( true === $gv_field->is_numeric ) { |
|
| 1528 | + $numeric_types[ ] = $gv_field->is_numeric; |
|
| 1529 | 1529 | } |
| 1530 | 1530 | } |
| 1531 | 1531 | |
@@ -1675,18 +1675,18 @@ discard block |
||
| 1675 | 1675 | $final_atts = array_filter( $final_atts ); |
| 1676 | 1676 | |
| 1677 | 1677 | // If the href wasn't passed as an attribute, use the value passed to the function |
| 1678 | - if ( empty( $final_atts['href'] ) && ! empty( $href ) ) { |
|
| 1679 | - $final_atts['href'] = $href; |
|
| 1678 | + if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) { |
|
| 1679 | + $final_atts[ 'href' ] = $href; |
|
| 1680 | 1680 | } |
| 1681 | 1681 | |
| 1682 | - $final_atts['href'] = esc_url_raw( $href ); |
|
| 1682 | + $final_atts[ 'href' ] = esc_url_raw( $href ); |
|
| 1683 | 1683 | |
| 1684 | 1684 | /** |
| 1685 | 1685 | * Fix potential security issue with target=_blank |
| 1686 | 1686 | * @see https://dev.to/ben/the-targetblank-vulnerability-by-example |
| 1687 | 1687 | */ |
| 1688 | - if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1689 | - $final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1688 | + if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1689 | + $final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1690 | 1690 | } |
| 1691 | 1691 | |
| 1692 | 1692 | // Sort the attributes alphabetically, to help testing |
@@ -1698,7 +1698,7 @@ discard block |
||
| 1698 | 1698 | $output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) ); |
| 1699 | 1699 | } |
| 1700 | 1700 | |
| 1701 | - if( '' !== $output ) { |
|
| 1701 | + if ( '' !== $output ) { |
|
| 1702 | 1702 | $output = '<a' . $output . '>' . $anchor_text . '</a>'; |
| 1703 | 1703 | } |
| 1704 | 1704 | |
@@ -1725,7 +1725,7 @@ discard block |
||
| 1725 | 1725 | if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1726 | 1726 | $merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1727 | 1727 | } else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) { |
| 1728 | - $merged[] = $value; |
|
| 1728 | + $merged[ ] = $value; |
|
| 1729 | 1729 | } else { |
| 1730 | 1730 | $merged[ $key ] = $value; |
| 1731 | 1731 | } |
@@ -1758,7 +1758,7 @@ discard block |
||
| 1758 | 1758 | * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..) |
| 1759 | 1759 | * @param array $settings Settings array, with `number` key defining the # of users to display |
| 1760 | 1760 | */ |
| 1761 | - $get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1761 | + $get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1762 | 1762 | |
| 1763 | 1763 | return get_users( $get_users_settings ); |
| 1764 | 1764 | } |
@@ -1778,11 +1778,11 @@ discard block |
||
| 1778 | 1778 | public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
| 1779 | 1779 | |
| 1780 | 1780 | // If $cap is defined, only show notice if user has capability |
| 1781 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1781 | + if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1782 | 1782 | return ''; |
| 1783 | 1783 | } |
| 1784 | 1784 | |
| 1785 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1785 | + return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>'; |
|
| 1786 | 1786 | } |
| 1787 | 1787 | |
| 1788 | 1788 | /** |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | * |
| 51 | 51 | * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total. |
| 52 | 52 | */ |
| 53 | - public function add_to_blacklist( $blacklist = array(), $context = NULL ){ |
|
| 53 | + public function add_to_blacklist( $blacklist = array(), $context = NULL ) { |
|
| 54 | 54 | |
| 55 | 55 | if( empty( $context ) || $context !== 'edit' ) { |
| 56 | 56 | return $blacklist; |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total. |
| 52 | 52 | */ |
| 53 | - public function add_to_blacklist( $blacklist = array(), $context = NULL ){ |
|
| 53 | + public function add_to_blacklist( $blacklist = array(), $context = NULL ) { |
|
| 54 | 54 | |
| 55 | - if( empty( $context ) || $context !== 'edit' ) { |
|
| 55 | + if ( empty( $context ) || $context !== 'edit' ) { |
|
| 56 | 56 | return $blacklist; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - $blacklist[] = 'total'; |
|
| 59 | + $blacklist[ ] = 'total'; |
|
| 60 | 60 | |
| 61 | 61 | return $blacklist; |
| 62 | 62 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) { |
| 76 | 76 | |
| 77 | - $original_form = GFAPI::get_form( $form['id'] ); |
|
| 77 | + $original_form = GFAPI::get_form( $form[ 'id' ] ); |
|
| 78 | 78 | |
| 79 | 79 | $total_fields = GFCommon::get_fields_by_type( $original_form, 'total' ); |
| 80 | 80 | |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | /** @var GF_Field_Total $total_field */ |
| 87 | 87 | foreach ( $total_fields as $total_field ) { |
| 88 | - $entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry ); |
|
| 88 | + $entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry ); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $return_entry = GFAPI::update_entry( $entry ); |
| 92 | 92 | |
| 93 | - if( is_wp_error( $return_entry ) ) { |
|
| 93 | + if ( is_wp_error( $return_entry ) ) { |
|
| 94 | 94 | gravityview()->log->error( 'Updating the entry total fields failed', array( 'data' => $return_entry ) ); |
| 95 | 95 | } else { |
| 96 | 96 | gravityview()->log->debug( 'Updating the entry total fields succeeded' ); |
@@ -313,6 +313,7 @@ |
||
| 313 | 313 | * Add a callback for lazy loading/counting. |
| 314 | 314 | * |
| 315 | 315 | * @param callable $callback The callback to call when needed. |
| 316 | + * @param string $type |
|
| 316 | 317 | * |
| 317 | 318 | * @return void |
| 318 | 319 | */ |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | /** Call all lazy callbacks. */ |
| 106 | 106 | foreach ( $this->callbacks as $callback ) { |
| 107 | - if ( $callback[0] != 'count' ) { |
|
| 107 | + if ( $callback[ 0 ] != 'count' ) { |
|
| 108 | 108 | continue; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $total += $callback[1]( $this->filters ); |
|
| 111 | + $total += $callback[ 1 ]( $this->filters ); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if ( ! $total ) { |
@@ -185,11 +185,11 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | /** Call all lazy callbacks. */ |
| 187 | 187 | foreach ( $this->callbacks as $i => $callback ) { |
| 188 | - if ( $callback[0] != 'fetch' ) { |
|
| 188 | + if ( $callback[ 0 ] != 'fetch' ) { |
|
| 189 | 189 | continue; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - $this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) ); |
|
| 192 | + $this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) ); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | $this->fetched = parent::count(); |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | return; |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | - $this->callbacks []= array( $type, $callback ); |
|
| 348 | + $this->callbacks [ ] = array( $type, $callback ); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @return void |
| 26 | 26 | */ |
| 27 | 27 | public function add( $value ) { |
| 28 | - $this->storage []= $value; |
|
| 28 | + $this->storage [ ] = $value; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @return void |
| 50 | 50 | */ |
| 51 | 51 | public function merge( \GV\Collection $collection ) { |
| 52 | - array_map( array( $this, 'add'), $collection->all() ); |
|
| 52 | + array_map( array( $this, 'add' ), $collection->all() ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -10,14 +10,14 @@ discard block |
||
| 10 | 10 | * Describes log levels. |
| 11 | 11 | */ |
| 12 | 12 | class LogLevel { |
| 13 | - const EMERGENCY = 'emergency'; |
|
| 14 | - const ALERT = 'alert'; |
|
| 15 | - const CRITICAL = 'critical'; |
|
| 16 | - const ERROR = 'error'; |
|
| 17 | - const WARNING = 'warning'; |
|
| 18 | - const NOTICE = 'notice'; |
|
| 19 | - const INFO = 'info'; |
|
| 20 | - const DEBUG = 'debug'; |
|
| 13 | + const EMERGENCY = 'emergency'; |
|
| 14 | + const ALERT = 'alert'; |
|
| 15 | + const CRITICAL = 'critical'; |
|
| 16 | + const ERROR = 'error'; |
|
| 17 | + const WARNING = 'warning'; |
|
| 18 | + const NOTICE = 'notice'; |
|
| 19 | + const INFO = 'info'; |
|
| 20 | + const DEBUG = 'debug'; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -28,127 +28,127 @@ discard block |
||
| 28 | 28 | * @see https://github.com/php-fig/log/blob/master/Psr/Log/AbstractLogger.php |
| 29 | 29 | */ |
| 30 | 30 | abstract class Logger /** @todo extends Psr\Log\AbstractLogger */ { |
| 31 | - /** |
|
| 32 | - * System is unusable. |
|
| 33 | - * |
|
| 34 | - * @param string $message |
|
| 35 | - * @param array $context |
|
| 36 | - * |
|
| 37 | - * @return void |
|
| 38 | - */ |
|
| 39 | - public function emergency($message, array $context = array()) |
|
| 40 | - { |
|
| 41 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
| 42 | - } |
|
| 31 | + /** |
|
| 32 | + * System is unusable. |
|
| 33 | + * |
|
| 34 | + * @param string $message |
|
| 35 | + * @param array $context |
|
| 36 | + * |
|
| 37 | + * @return void |
|
| 38 | + */ |
|
| 39 | + public function emergency($message, array $context = array()) |
|
| 40 | + { |
|
| 41 | + $this->log(LogLevel::EMERGENCY, $message, $context); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Action must be taken immediately. |
|
| 46 | - * |
|
| 47 | - * Example: Entire website down, database unavailable, etc. This should |
|
| 48 | - * trigger the SMS alerts and wake you up. |
|
| 49 | - * |
|
| 50 | - * @param string $message |
|
| 51 | - * @param array $context |
|
| 52 | - * |
|
| 53 | - * @return void |
|
| 54 | - */ |
|
| 55 | - public function alert($message, array $context = array()) |
|
| 56 | - { |
|
| 57 | - $this->log(LogLevel::ALERT, $message, $context); |
|
| 58 | - } |
|
| 44 | + /** |
|
| 45 | + * Action must be taken immediately. |
|
| 46 | + * |
|
| 47 | + * Example: Entire website down, database unavailable, etc. This should |
|
| 48 | + * trigger the SMS alerts and wake you up. |
|
| 49 | + * |
|
| 50 | + * @param string $message |
|
| 51 | + * @param array $context |
|
| 52 | + * |
|
| 53 | + * @return void |
|
| 54 | + */ |
|
| 55 | + public function alert($message, array $context = array()) |
|
| 56 | + { |
|
| 57 | + $this->log(LogLevel::ALERT, $message, $context); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Critical conditions. |
|
| 62 | - * |
|
| 63 | - * Example: Application component unavailable, unexpected exception. |
|
| 64 | - * |
|
| 65 | - * @param string $message |
|
| 66 | - * @param array $context |
|
| 67 | - * |
|
| 68 | - * @return void |
|
| 69 | - */ |
|
| 70 | - public function critical($message, array $context = array()) |
|
| 71 | - { |
|
| 72 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
| 73 | - } |
|
| 60 | + /** |
|
| 61 | + * Critical conditions. |
|
| 62 | + * |
|
| 63 | + * Example: Application component unavailable, unexpected exception. |
|
| 64 | + * |
|
| 65 | + * @param string $message |
|
| 66 | + * @param array $context |
|
| 67 | + * |
|
| 68 | + * @return void |
|
| 69 | + */ |
|
| 70 | + public function critical($message, array $context = array()) |
|
| 71 | + { |
|
| 72 | + $this->log(LogLevel::CRITICAL, $message, $context); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * Runtime errors that do not require immediate action but should typically |
|
| 77 | - * be logged and monitored. |
|
| 78 | - * |
|
| 79 | - * @param string $message |
|
| 80 | - * @param array $context |
|
| 81 | - * |
|
| 82 | - * @return void |
|
| 83 | - */ |
|
| 84 | - public function error($message, array $context = array()) |
|
| 85 | - { |
|
| 86 | - $this->log(LogLevel::ERROR, $message, $context); |
|
| 87 | - } |
|
| 75 | + /** |
|
| 76 | + * Runtime errors that do not require immediate action but should typically |
|
| 77 | + * be logged and monitored. |
|
| 78 | + * |
|
| 79 | + * @param string $message |
|
| 80 | + * @param array $context |
|
| 81 | + * |
|
| 82 | + * @return void |
|
| 83 | + */ |
|
| 84 | + public function error($message, array $context = array()) |
|
| 85 | + { |
|
| 86 | + $this->log(LogLevel::ERROR, $message, $context); |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * Exceptional occurrences that are not errors. |
|
| 91 | - * |
|
| 92 | - * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
| 93 | - * that are not necessarily wrong. |
|
| 94 | - * |
|
| 95 | - * @param string $message |
|
| 96 | - * @param array $context |
|
| 97 | - * |
|
| 98 | - * @return void |
|
| 99 | - */ |
|
| 100 | - public function warning($message, array $context = array()) |
|
| 101 | - { |
|
| 102 | - $this->log(LogLevel::WARNING, $message, $context); |
|
| 103 | - } |
|
| 89 | + /** |
|
| 90 | + * Exceptional occurrences that are not errors. |
|
| 91 | + * |
|
| 92 | + * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
| 93 | + * that are not necessarily wrong. |
|
| 94 | + * |
|
| 95 | + * @param string $message |
|
| 96 | + * @param array $context |
|
| 97 | + * |
|
| 98 | + * @return void |
|
| 99 | + */ |
|
| 100 | + public function warning($message, array $context = array()) |
|
| 101 | + { |
|
| 102 | + $this->log(LogLevel::WARNING, $message, $context); |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * Normal but significant events. |
|
| 107 | - * |
|
| 108 | - * @param string $message |
|
| 109 | - * @param array $context |
|
| 110 | - * |
|
| 111 | - * @return void |
|
| 112 | - */ |
|
| 113 | - public function notice($message, array $context = array()) |
|
| 114 | - { |
|
| 115 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
| 116 | - } |
|
| 105 | + /** |
|
| 106 | + * Normal but significant events. |
|
| 107 | + * |
|
| 108 | + * @param string $message |
|
| 109 | + * @param array $context |
|
| 110 | + * |
|
| 111 | + * @return void |
|
| 112 | + */ |
|
| 113 | + public function notice($message, array $context = array()) |
|
| 114 | + { |
|
| 115 | + $this->log(LogLevel::NOTICE, $message, $context); |
|
| 116 | + } |
|
| 117 | 117 | |
| 118 | - /** |
|
| 119 | - * Interesting events. |
|
| 120 | - * |
|
| 121 | - * Example: User logs in, SQL logs. |
|
| 122 | - * |
|
| 123 | - * @param string $message |
|
| 124 | - * @param array $context |
|
| 125 | - * |
|
| 126 | - * @return void |
|
| 127 | - */ |
|
| 128 | - public function info($message, array $context = array()) |
|
| 129 | - { |
|
| 130 | - $this->log(LogLevel::INFO, $message, $context); |
|
| 131 | - } |
|
| 118 | + /** |
|
| 119 | + * Interesting events. |
|
| 120 | + * |
|
| 121 | + * Example: User logs in, SQL logs. |
|
| 122 | + * |
|
| 123 | + * @param string $message |
|
| 124 | + * @param array $context |
|
| 125 | + * |
|
| 126 | + * @return void |
|
| 127 | + */ |
|
| 128 | + public function info($message, array $context = array()) |
|
| 129 | + { |
|
| 130 | + $this->log(LogLevel::INFO, $message, $context); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - /** |
|
| 134 | - * Detailed debug information. |
|
| 135 | - * |
|
| 136 | - * @param string $message |
|
| 137 | - * @param array $context |
|
| 138 | - * |
|
| 139 | - * @return void |
|
| 140 | - */ |
|
| 141 | - public function debug($message, array $context = array()) |
|
| 142 | - { |
|
| 143 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
| 144 | - } |
|
| 133 | + /** |
|
| 134 | + * Detailed debug information. |
|
| 135 | + * |
|
| 136 | + * @param string $message |
|
| 137 | + * @param array $context |
|
| 138 | + * |
|
| 139 | + * @return void |
|
| 140 | + */ |
|
| 141 | + public function debug($message, array $context = array()) |
|
| 142 | + { |
|
| 143 | + $this->log(LogLevel::DEBUG, $message, $context); |
|
| 144 | + } |
|
| 145 | 145 | |
| 146 | 146 | /** |
| 147 | 147 | * Bake the context into { } placeholders in the message. |
| 148 | - * @param string $message |
|
| 149 | - * @param array $context |
|
| 150 | - * |
|
| 151 | - * @return string The baked message; |
|
| 148 | + * @param string $message |
|
| 149 | + * @param array $context |
|
| 150 | + * |
|
| 151 | + * @return string The baked message; |
|
| 152 | 152 | */ |
| 153 | 153 | protected function interpolate( $message, $context ) { |
| 154 | 154 | foreach ( $context as $key => $val ) { |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | * |
| 37 | 37 | * @return void |
| 38 | 38 | */ |
| 39 | - public function emergency($message, array $context = array()) |
|
| 39 | + public function emergency( $message, array $context = array() ) |
|
| 40 | 40 | { |
| 41 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
| 41 | + $this->log( LogLevel::EMERGENCY, $message, $context ); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @return void |
| 54 | 54 | */ |
| 55 | - public function alert($message, array $context = array()) |
|
| 55 | + public function alert( $message, array $context = array() ) |
|
| 56 | 56 | { |
| 57 | - $this->log(LogLevel::ALERT, $message, $context); |
|
| 57 | + $this->log( LogLevel::ALERT, $message, $context ); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * |
| 68 | 68 | * @return void |
| 69 | 69 | */ |
| 70 | - public function critical($message, array $context = array()) |
|
| 70 | + public function critical( $message, array $context = array() ) |
|
| 71 | 71 | { |
| 72 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
| 72 | + $this->log( LogLevel::CRITICAL, $message, $context ); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -81,9 +81,9 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return void |
| 83 | 83 | */ |
| 84 | - public function error($message, array $context = array()) |
|
| 84 | + public function error( $message, array $context = array() ) |
|
| 85 | 85 | { |
| 86 | - $this->log(LogLevel::ERROR, $message, $context); |
|
| 86 | + $this->log( LogLevel::ERROR, $message, $context ); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -97,9 +97,9 @@ discard block |
||
| 97 | 97 | * |
| 98 | 98 | * @return void |
| 99 | 99 | */ |
| 100 | - public function warning($message, array $context = array()) |
|
| 100 | + public function warning( $message, array $context = array() ) |
|
| 101 | 101 | { |
| 102 | - $this->log(LogLevel::WARNING, $message, $context); |
|
| 102 | + $this->log( LogLevel::WARNING, $message, $context ); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -110,9 +110,9 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return void |
| 112 | 112 | */ |
| 113 | - public function notice($message, array $context = array()) |
|
| 113 | + public function notice( $message, array $context = array() ) |
|
| 114 | 114 | { |
| 115 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
| 115 | + $this->log( LogLevel::NOTICE, $message, $context ); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | * |
| 126 | 126 | * @return void |
| 127 | 127 | */ |
| 128 | - public function info($message, array $context = array()) |
|
| 128 | + public function info( $message, array $context = array() ) |
|
| 129 | 129 | { |
| 130 | - $this->log(LogLevel::INFO, $message, $context); |
|
| 130 | + $this->log( LogLevel::INFO, $message, $context ); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -138,9 +138,9 @@ discard block |
||
| 138 | 138 | * |
| 139 | 139 | * @return void |
| 140 | 140 | */ |
| 141 | - public function debug($message, array $context = array()) |
|
| 141 | + public function debug( $message, array $context = array() ) |
|
| 142 | 142 | { |
| 143 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
| 143 | + $this->log( LogLevel::DEBUG, $message, $context ); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -36,8 +36,7 @@ discard block |
||
| 36 | 36 | * |
| 37 | 37 | * @return void |
| 38 | 38 | */ |
| 39 | - public function emergency($message, array $context = array()) |
|
| 40 | - { |
|
| 39 | + public function emergency($message, array $context = array()) { |
|
| 41 | 40 | $this->log(LogLevel::EMERGENCY, $message, $context); |
| 42 | 41 | } |
| 43 | 42 | |
@@ -52,8 +51,7 @@ discard block |
||
| 52 | 51 | * |
| 53 | 52 | * @return void |
| 54 | 53 | */ |
| 55 | - public function alert($message, array $context = array()) |
|
| 56 | - { |
|
| 54 | + public function alert($message, array $context = array()) { |
|
| 57 | 55 | $this->log(LogLevel::ALERT, $message, $context); |
| 58 | 56 | } |
| 59 | 57 | |
@@ -67,8 +65,7 @@ discard block |
||
| 67 | 65 | * |
| 68 | 66 | * @return void |
| 69 | 67 | */ |
| 70 | - public function critical($message, array $context = array()) |
|
| 71 | - { |
|
| 68 | + public function critical($message, array $context = array()) { |
|
| 72 | 69 | $this->log(LogLevel::CRITICAL, $message, $context); |
| 73 | 70 | } |
| 74 | 71 | |
@@ -81,8 +78,7 @@ discard block |
||
| 81 | 78 | * |
| 82 | 79 | * @return void |
| 83 | 80 | */ |
| 84 | - public function error($message, array $context = array()) |
|
| 85 | - { |
|
| 81 | + public function error($message, array $context = array()) { |
|
| 86 | 82 | $this->log(LogLevel::ERROR, $message, $context); |
| 87 | 83 | } |
| 88 | 84 | |
@@ -97,8 +93,7 @@ discard block |
||
| 97 | 93 | * |
| 98 | 94 | * @return void |
| 99 | 95 | */ |
| 100 | - public function warning($message, array $context = array()) |
|
| 101 | - { |
|
| 96 | + public function warning($message, array $context = array()) { |
|
| 102 | 97 | $this->log(LogLevel::WARNING, $message, $context); |
| 103 | 98 | } |
| 104 | 99 | |
@@ -110,8 +105,7 @@ discard block |
||
| 110 | 105 | * |
| 111 | 106 | * @return void |
| 112 | 107 | */ |
| 113 | - public function notice($message, array $context = array()) |
|
| 114 | - { |
|
| 108 | + public function notice($message, array $context = array()) { |
|
| 115 | 109 | $this->log(LogLevel::NOTICE, $message, $context); |
| 116 | 110 | } |
| 117 | 111 | |
@@ -125,8 +119,7 @@ discard block |
||
| 125 | 119 | * |
| 126 | 120 | * @return void |
| 127 | 121 | */ |
| 128 | - public function info($message, array $context = array()) |
|
| 129 | - { |
|
| 122 | + public function info($message, array $context = array()) { |
|
| 130 | 123 | $this->log(LogLevel::INFO, $message, $context); |
| 131 | 124 | } |
| 132 | 125 | |
@@ -138,8 +131,7 @@ discard block |
||
| 138 | 131 | * |
| 139 | 132 | * @return void |
| 140 | 133 | */ |
| 141 | - public function debug($message, array $context = array()) |
|
| 142 | - { |
|
| 134 | + public function debug($message, array $context = array()) { |
|
| 143 | 135 | $this->log(LogLevel::DEBUG, $message, $context); |
| 144 | 136 | } |
| 145 | 137 | |