@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); |
| 46 | 46 | |
| 47 | 47 | // It's not the parent field; it's an input |
| 48 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 48 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 49 | 49 | |
| 50 | - if( $this->is_choice_value_enabled() ) { |
|
| 50 | + if ( $this->is_choice_value_enabled() ) { |
|
| 51 | 51 | |
| 52 | 52 | $desc = esc_html__( 'This input has a label and a value. What should be displayed?', 'gravityview' ); |
| 53 | 53 | $default = 'value'; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | ); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $field_options['choice_display'] = array( |
|
| 68 | + $field_options[ 'choice_display' ] = array( |
|
| 69 | 69 | 'type' => 'radio', |
| 70 | 70 | 'class' => 'vertical', |
| 71 | 71 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | var $is_searchable = true; |
| 13 | 13 | |
| 14 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
| 14 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
| 15 | 15 | |
| 16 | 16 | var $_gf_field_class_name = 'GF_Field_Radio'; |
| 17 | 17 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | // Set the $_field_id var |
| 41 | 41 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); |
| 42 | 42 | |
| 43 | - if( $this->is_choice_value_enabled() ) { |
|
| 44 | - $field_options['choice_display'] = array( |
|
| 43 | + if ( $this->is_choice_value_enabled() ) { |
|
| 44 | + $field_options[ 'choice_display' ] = array( |
|
| 45 | 45 | 'type' => 'radio', |
| 46 | 46 | 'value' => 'value', |
| 47 | 47 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | // Set the $_field_id var |
| 45 | 45 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); |
| 46 | 46 | |
| 47 | - if( $this->is_choice_value_enabled() ) { |
|
| 48 | - $field_options['choice_display'] = array( |
|
| 47 | + if ( $this->is_choice_value_enabled() ) { |
|
| 48 | + $field_options[ 'choice_display' ] = array( |
|
| 49 | 49 | 'type' => 'radio', |
| 50 | 50 | 'value' => 'value', |
| 51 | 51 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | parent::add_hooks(); |
| 44 | 44 | |
| 45 | - add_shortcode( 'gv_pageviews', array( $this, 'pageviews') ); |
|
| 45 | + add_shortcode( 'gv_pageviews', array( $this, 'pageviews' ) ); |
|
| 46 | 46 | |
| 47 | 47 | add_filter( 'gravityview/fields/custom/decode_shortcodes', array( $this, 'inject_entry_id' ), 10, 3 ); |
| 48 | 48 | |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * Used as sort of an action via the gravityview/fields/custom/decode_shortcodes filter. |
| 69 | 69 | */ |
| 70 | 70 | public function inject_entry_id( $r, $content, $context ) { |
| 71 | - if ( ! empty( $context->entry['id'] ) ) { |
|
| 72 | - $this->next_id = $context->entry['id']; |
|
| 71 | + if ( ! empty( $context->entry[ 'id' ] ) ) { |
|
| 72 | + $this->next_id = $context->entry[ 'id' ]; |
|
| 73 | 73 | } else { |
| 74 | 74 | $this->next_id = false; // Nothing to look at, move along |
| 75 | 75 | } |
@@ -97,13 +97,13 @@ discard block |
||
| 97 | 97 | 'id' => $this->next_id, |
| 98 | 98 | ), $atts ); |
| 99 | 99 | |
| 100 | - if ( ! $this->atts['id'] ) { |
|
| 100 | + if ( ! $this->atts[ 'id' ] ) { |
|
| 101 | 101 | return; // The ID was not set |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | add_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) ); |
| 105 | 105 | |
| 106 | - $output = Pageviews::placeholder( 'GV' . $this->atts['id'] ); // Prefix the ID to avoid collissions with default post IDs |
|
| 106 | + $output = Pageviews::placeholder( 'GV' . $this->atts[ 'id' ] ); // Prefix the ID to avoid collissions with default post IDs |
|
| 107 | 107 | |
| 108 | 108 | remove_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) ); |
| 109 | 109 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * Set the preload text. |
| 115 | 115 | */ |
| 116 | 116 | public function preload_callback( $preload ) { |
| 117 | - return $this->atts['preload']; |
|
| 117 | + return $this->atts[ 'preload' ]; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function increment_callback() { |
| 124 | 124 | if ( $entry = gravityview()->request->is_entry() ) { |
| 125 | - $increment = 'GV' . $entry['id']; |
|
| 125 | + $increment = 'GV' . $entry[ 'id' ]; |
|
| 126 | 126 | ?> |
| 127 | 127 | _pv_config.incr = <?php echo json_encode( $increment ); ?>; |
| 128 | 128 | <?php |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Process and output the [gventry] shortcode. |
| 20 | 20 | * |
| 21 | - * @param array $passed_atts The attributes passed. |
|
| 22 | 21 | * @param string $content The content inside the shortcode. |
| 23 | 22 | * @param string $tag The shortcode tag. |
| 24 | 23 | * |
@@ -47,22 +47,22 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | $atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts ); |
| 49 | 49 | |
| 50 | - $view = \GV\View::by_id( $atts['view_id'] ); |
|
| 50 | + $view = \GV\View::by_id( $atts[ 'view_id' ] ); |
|
| 51 | 51 | |
| 52 | 52 | if ( ! $view ) { |
| 53 | - gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) ); |
|
| 53 | + gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
| 54 | 54 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts ); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id']; |
|
| 57 | + $entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ]; |
|
| 58 | 58 | |
| 59 | - switch( $entry_id ): |
|
| 59 | + switch ( $entry_id ): |
|
| 60 | 60 | case 'last': |
| 61 | 61 | $entries = $view->get_entries( null ); |
| 62 | 62 | |
| 63 | 63 | /** If a sort already exists, reverse it. */ |
| 64 | 64 | if ( $sort = end( $entries->sorts ) ) { |
| 65 | - $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
| 65 | + $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
| 66 | 66 | } else { |
| 67 | 67 | /** Otherwise, sort by date_created */ |
| 68 | 68 | $entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC ); |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | break; |
| 80 | 80 | default: |
| 81 | 81 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
| 82 | - gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) ); |
|
| 82 | + gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
| 83 | 83 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts ); |
| 84 | 84 | } |
| 85 | 85 | endswitch; |
| 86 | 86 | |
| 87 | - if ( $view->form->ID != $entry['form_id'] ) { |
|
| 87 | + if ( $view->form->ID != $entry[ 'form_id' ] ) { |
|
| 88 | 88 | gravityview()->log->error( 'Entry does not belong to view (form mismatch)' ); |
| 89 | 89 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 90 | 90 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts ); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if ( ! $view->form ) { |
|
| 97 | + if ( ! $view->form ) { |
|
| 98 | 98 | gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) ); |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -117,43 +117,43 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** Unapproved entries. */ |
| 120 | - if ( $entry['status'] != 'active' ) { |
|
| 120 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 121 | 121 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 122 | 122 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 125 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 126 | 126 | |
| 127 | 127 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 128 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 128 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 129 | 129 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 130 | 130 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - if ( $atts['edit'] ) { |
|
| 134 | + if ( $atts[ 'edit' ] ) { |
|
| 135 | 135 | /** |
| 136 | 136 | * Based on code in our unit-tests. |
| 137 | 137 | * Mocks old context, etc. |
| 138 | 138 | */ |
| 139 | 139 | $loader = \GravityView_Edit_Entry::getInstance(); |
| 140 | - $render = $loader->instances['render']; |
|
| 140 | + $render = $loader->instances[ 'render' ]; |
|
| 141 | 141 | |
| 142 | 142 | add_filter( 'gravityview/is_single_entry', '__return_true' ); |
| 143 | 143 | |
| 144 | - $form = \GFAPI::get_form( $entry['form_id'] ); |
|
| 144 | + $form = \GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 145 | 145 | |
| 146 | 146 | $data = \GravityView_View_Data::getInstance( $view ); |
| 147 | 147 | $template = \GravityView_View::getInstance( array( |
| 148 | 148 | 'form' => $form, |
| 149 | - 'form_id' => $form['id'], |
|
| 149 | + 'form_id' => $form[ 'id' ], |
|
| 150 | 150 | 'view_id' => $view->ID, |
| 151 | 151 | 'entries' => array( $entry ), |
| 152 | 152 | 'atts' => \GVCommon::get_template_settings( $view->ID ), |
| 153 | 153 | ) ); |
| 154 | 154 | |
| 155 | - $_GET['edit'] = wp_create_nonce( |
|
| 156 | - \GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] ) |
|
| 155 | + $_GET[ 'edit' ] = wp_create_nonce( |
|
| 156 | + \GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] ) |
|
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | 159 | add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) { |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts ); |
| 171 | 171 | } ); |
| 172 | 172 | |
| 173 | - ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view ); |
|
| 173 | + ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view ); |
|
| 174 | 174 | $output = ob_get_clean(); // Render :) |
| 175 | 175 | |
| 176 | 176 | remove_filter( 'gravityview/is_single_entry', '__return_true' ); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | $renderer = new \GV\Entry_Renderer(); |
| 183 | 183 | |
| 184 | 184 | $request = new \GV\Mock_Request(); |
| 185 | - $request->returns['is_entry'] = $entry; |
|
| 185 | + $request->returns[ 'is_entry' ] = $entry; |
|
| 186 | 186 | |
| 187 | 187 | $output = $renderer->render( $entry, $view, $request ); |
| 188 | 188 | |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Process and output the [gvfield] shortcode. |
| 20 | 20 | * |
| 21 | - * @param array $passed_atts The attributes passed. |
|
| 22 | 21 | * @param string $content The content inside the shortcode. |
| 23 | 22 | * @param string $tag The shortcode tag. |
| 24 | 23 | * |
@@ -46,19 +46,19 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | $atts = apply_filters( 'gravityview/shortcodes/gvfield/atts', $atts ); |
| 48 | 48 | |
| 49 | - if ( ! $view = \GV\View::by_id( $atts['view_id'] ) ) { |
|
| 50 | - gravityview()->log->error( 'View #{view_id} not found', array( 'view_id' => $atts['view_id'] ) ); |
|
| 49 | + if ( ! $view = \GV\View::by_id( $atts[ 'view_id' ] ) ) { |
|
| 50 | + gravityview()->log->error( 'View #{view_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
| 51 | 51 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, null, null, $atts ); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - switch( $atts['entry_id'] ): |
|
| 54 | + switch ( $atts[ 'entry_id' ] ): |
|
| 55 | 55 | case 'last': |
| 56 | 56 | $entries = $view->get_entries(); |
| 57 | 57 | |
| 58 | 58 | /** If a sort already exists, reverse it. */ |
| 59 | 59 | if ( $sort = end( $entries->sorts ) ) { |
| 60 | 60 | // @todo For multisorts we need to do this for each sort |
| 61 | - $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
| 61 | + $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
| 62 | 62 | } else { |
| 63 | 63 | /** Otherwise, sort by date_created */ |
| 64 | 64 | $entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC ); |
@@ -74,20 +74,20 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | break; |
| 76 | 76 | default: |
| 77 | - if ( ! $entry = \GV\GF_Entry::by_id( $atts['entry_id'] ) ) { |
|
| 78 | - gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) ); |
|
| 77 | + if ( ! $entry = \GV\GF_Entry::by_id( $atts[ 'entry_id' ] ) ) { |
|
| 78 | + gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
| 79 | 79 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, null, $atts ); |
| 80 | 80 | } |
| 81 | 81 | endswitch; |
| 82 | 82 | |
| 83 | - $field = is_numeric( $atts['field_id'] ) ? \GV\GF_Field::by_id( $view->form, $atts['field_id'] ) : \GV\Internal_Field::by_id( $atts['field_id'] ); |
|
| 83 | + $field = is_numeric( $atts[ 'field_id' ] ) ? \GV\GF_Field::by_id( $view->form, $atts[ 'field_id' ] ) : \GV\Internal_Field::by_id( $atts[ 'field_id' ] ); |
|
| 84 | 84 | |
| 85 | 85 | if ( ! $field ) { |
| 86 | - gravityview()->log->error( 'Field #{field_id} not found', array( 'view_id' => $atts['field_id'] ) ); |
|
| 86 | + gravityview()->log->error( 'Field #{field_id} not found', array( 'view_id' => $atts[ 'field_id' ] ) ); |
|
| 87 | 87 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $field, $atts ); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - if ( $view->form->ID != $entry['form_id'] ) { |
|
| 90 | + if ( $view->form->ID != $entry[ 'form_id' ] ) { |
|
| 91 | 91 | gravityview()->log->error( 'Entry does not belong to view (form mismatch)' ); |
| 92 | 92 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts ); |
| 93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | return apply_filters( 'gravityview/shortcodes/gvfield/output', get_the_password_form( $view->ID ), $view, $entry, $atts ); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - if ( ! $view->form ) { |
|
| 100 | + if ( ! $view->form ) { |
|
| 101 | 101 | gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) ); |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** Unapproved entries. */ |
| 123 | - if ( $entry['status'] != 'active' ) { |
|
| 123 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 124 | 124 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 125 | 125 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts ); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ( $view->settings->get( 'show_only_approved' ) ) { |
| 129 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 129 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 130 | 130 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 131 | 131 | return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts ); |
| 132 | 132 | } |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | return self::$instance; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function shortcode( $atts, $content = '', $tag = '') { |
|
| 20 | + public function shortcode( $atts, $content = '', $tag = '' ) { |
|
| 21 | 21 | $shortcode = new \GV\Shortcodes\gvlogic(); |
| 22 | 22 | return $shortcode->callback( $atts, $content, $tag ); |
| 23 | 23 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | 'total' => wp_count_posts( 'gravityview' )->publish, |
| 64 | 64 | ); |
| 65 | 65 | foreach ( $items as $item ) { |
| 66 | - $data['views'][] = $this->prepare_view_for_response( $item, $request ); |
|
| 66 | + $data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request ); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | return new \WP_REST_Response( $data, 200 ); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $url = $request->get_url_params(); |
| 84 | 84 | |
| 85 | - $view_id = intval( $url['id'] ); |
|
| 85 | + $view_id = intval( $url[ 'id' ] ); |
|
| 86 | 86 | |
| 87 | 87 | $item = get_post( $view_id ); |
| 88 | 88 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | // Only output the fields that should be displayed. |
| 115 | 115 | $allowed = array(); |
| 116 | 116 | foreach ( $view->fields->by_position( "{$context}_*" )->by_visible( $view )->all() as $field ) { |
| 117 | - $allowed[] = $field; |
|
| 117 | + $allowed[ ] = $field; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | // Tack on additional fields if needed |
| 135 | 135 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
| 136 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 136 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | $r = new Request( $request ); |
@@ -211,10 +211,10 @@ discard block |
||
| 211 | 211 | public function get_sub_items( $request ) { |
| 212 | 212 | |
| 213 | 213 | $url = $request->get_url_params(); |
| 214 | - $view_id = intval( $url['id'] ); |
|
| 214 | + $view_id = intval( $url[ 'id' ] ); |
|
| 215 | 215 | $format = \GV\Utils::get( $url, 'format', 'json' ); |
| 216 | 216 | |
| 217 | - if( $post_id = $request->get_param('post_id') ) { |
|
| 217 | + if ( $post_id = $request->get_param( 'post_id' ) ) { |
|
| 218 | 218 | global $post; |
| 219 | 219 | |
| 220 | 220 | $post = get_post( $post_id ); |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | |
| 320 | 320 | $data = array( 'entries' => $entries->all(), 'total' => $entries->total() ); |
| 321 | 321 | |
| 322 | - foreach ( $data['entries'] as &$entry ) { |
|
| 322 | + foreach ( $data[ 'entries' ] as &$entry ) { |
|
| 323 | 323 | $entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' ); |
| 324 | 324 | } |
| 325 | 325 | |
@@ -338,8 +338,8 @@ discard block |
||
| 338 | 338 | */ |
| 339 | 339 | public function get_sub_item( $request ) { |
| 340 | 340 | $url = $request->get_url_params(); |
| 341 | - $view_id = intval( $url['id'] ); |
|
| 342 | - $entry_id = intval( $url['s_id'] ); |
|
| 341 | + $view_id = intval( $url[ 'id' ] ); |
|
| 342 | + $entry_id = intval( $url[ 's_id' ] ); |
|
| 343 | 343 | $format = \GV\Utils::get( $url, 'format', 'json' ); |
| 344 | 344 | |
| 345 | 345 | $view = \GV\View::by_id( $view_id ); |
@@ -374,32 +374,32 @@ discard block |
||
| 374 | 374 | // Add all the WP_Post data |
| 375 | 375 | $view_post = $view_post->to_array(); |
| 376 | 376 | |
| 377 | - unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] ); |
|
| 377 | + unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] ); |
|
| 378 | 378 | |
| 379 | 379 | $return = wp_parse_args( $item, $view_post ); |
| 380 | 380 | |
| 381 | - $return['title'] = $return['post_title']; |
|
| 381 | + $return[ 'title' ] = $return[ 'post_title' ]; |
|
| 382 | 382 | |
| 383 | - $return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array(); |
|
| 384 | - unset( $return['atts'], $return['view_id'] ); |
|
| 383 | + $return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array(); |
|
| 384 | + unset( $return[ 'atts' ], $return[ 'view_id' ] ); |
|
| 385 | 385 | |
| 386 | - $return['search_criteria'] = array( |
|
| 386 | + $return[ 'search_criteria' ] = array( |
|
| 387 | 387 | 'page_size' => rgars( $return, 'settings/page_size' ), |
| 388 | 388 | 'sort_field' => rgars( $return, 'settings/sort_field' ), |
| 389 | 389 | 'sort_direction' => rgars( $return, 'settings/sort_direction' ), |
| 390 | 390 | 'offset' => rgars( $return, 'settings/offset' ), |
| 391 | 391 | ); |
| 392 | 392 | |
| 393 | - unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] ); |
|
| 393 | + unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] ); |
|
| 394 | 394 | |
| 395 | 395 | // Redact for non-logged ins |
| 396 | 396 | if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) { |
| 397 | - unset( $return['settings'] ); |
|
| 398 | - unset( $return['search_criteria'] ); |
|
| 397 | + unset( $return[ 'settings' ] ); |
|
| 398 | + unset( $return[ 'search_criteria' ] ); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) { |
| 402 | - unset( $return['form'] ); |
|
| 402 | + unset( $return[ 'form' ] ); |
|
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | return $return; |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | $view_id = func_get_arg( 1 ); // $view_id override |
| 416 | 416 | } else { |
| 417 | 417 | $url = $request->get_url_params(); |
| 418 | - $view_id = intval( $url['id'] ); |
|
| 418 | + $view_id = intval( $url[ 'id' ] ); |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | if ( ! $view = \GV\View::by_id( $view_id ) ) { |
@@ -461,8 +461,8 @@ discard block |
||
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | $url = $request->get_url_params(); |
| 464 | - $view_id = intval( $url['id'] ); |
|
| 465 | - $entry_id = intval( $url['s_id'] ); |
|
| 464 | + $view_id = intval( $url[ 'id' ] ); |
|
| 465 | + $entry_id = intval( $url[ 's_id' ] ); |
|
| 466 | 466 | |
| 467 | 467 | $view = \GV\View::by_id( $view_id ); |
| 468 | 468 | |
@@ -470,11 +470,11 @@ discard block |
||
| 470 | 470 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - if ( $entry['form_id'] != $view->form->ID ) { |
|
| 473 | + if ( $entry[ 'form_id' ] != $view->form->ID ) { |
|
| 474 | 474 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if ( $entry['status'] != 'active' ) { |
|
| 477 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 478 | 478 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 479 | 479 | } |
| 480 | 480 | |
@@ -482,10 +482,10 @@ discard block |
||
| 482 | 482 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 483 | 483 | } |
| 484 | 484 | |
| 485 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 485 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 486 | 486 | |
| 487 | 487 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 488 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 488 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 489 | 489 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 490 | 490 | } |
| 491 | 491 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | public function __construct() { |
| 20 | 20 | $this->label = esc_html__( 'Unsubscribe', 'gravityview' ); |
| 21 | - $this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' ); |
|
| 21 | + $this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' ); |
|
| 22 | 22 | |
| 23 | 23 | $this->add_hooks(); |
| 24 | 24 | |
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 59 | 59 | |
| 60 | - unset( $field_options['only_loggedin'] ); |
|
| 60 | + unset( $field_options[ 'only_loggedin' ] ); |
|
| 61 | 61 | |
| 62 | - unset( $field_options['new_window'] ); |
|
| 62 | + unset( $field_options[ 'new_window' ] ); |
|
| 63 | 63 | |
| 64 | - unset( $field_options['show_as_link'] ); |
|
| 64 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 65 | 65 | |
| 66 | - $add_options['unsub_all'] = array( |
|
| 66 | + $add_options[ 'unsub_all' ] = array( |
|
| 67 | 67 | 'type' => 'checkbox', |
| 68 | 68 | 'label' => __( 'Allow admins to unsubscribe', 'gravityview' ), |
| 69 | 69 | 'desc' => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ), |
@@ -130,9 +130,9 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | foreach ( $feeds as $feed ) { |
| 133 | - if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) { |
|
| 134 | - if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) { |
|
| 135 | - $entry_default_fields["{$this->name}"] = array( |
|
| 133 | + if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) { |
|
| 134 | + if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) { |
|
| 135 | + $entry_default_fields[ "{$this->name}" ] = array( |
|
| 136 | 136 | 'label' => $this->label, |
| 137 | 137 | 'desc' => $this->description, |
| 138 | 138 | 'type' => $this->name, |
@@ -163,10 +163,10 @@ discard block |
||
| 163 | 163 | return $output; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - $can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) ); |
|
| 166 | + $can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) ); |
|
| 167 | 167 | |
| 168 | 168 | if ( ! $can_current_user_edit ) { |
| 169 | - if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) { |
|
| 169 | + if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) { |
|
| 170 | 170 | return $output; |
| 171 | 171 | } |
| 172 | 172 | } |
@@ -179,21 +179,21 @@ discard block |
||
| 179 | 179 | // @todo Also make sure we check caps if moved from here |
| 180 | 180 | // @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten |
| 181 | 181 | if ( $entry = $this->maybe_unsubscribe( $entry ) ) { |
| 182 | - if ( $entry['payment_status'] !== $status ) { |
|
| 182 | + if ( $entry[ 'payment_status' ] !== $status ) { |
|
| 183 | 183 | // @todo Probably __( 'Unsubscribed', 'gravityview' ); |
| 184 | - return $entry['payment_status']; |
|
| 184 | + return $entry[ 'payment_status' ]; |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) { |
|
| 188 | + if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) { |
|
| 189 | 189 | return $output; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | global $wp; |
| 193 | 193 | $current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) ); |
| 194 | 194 | |
| 195 | - $link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url ); |
|
| 196 | - $link = add_query_arg( 'uid', $entry['id'], $link ); |
|
| 195 | + $link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url ); |
|
| 196 | + $link = add_query_arg( 'uid', $entry[ 'id' ], $link ); |
|
| 197 | 197 | |
| 198 | 198 | return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) ); |
| 199 | 199 | } |
@@ -213,11 +213,11 @@ discard block |
||
| 213 | 213 | */ |
| 214 | 214 | private function maybe_unsubscribe( $entry ) { |
| 215 | 215 | |
| 216 | - if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) { |
|
| 216 | + if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) { |
|
| 217 | 217 | return $entry; |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) { |
|
| 220 | + if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) { |
|
| 221 | 221 | return $entry; |
| 222 | 222 | } |
| 223 | 223 | |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | $subscription_addons[ $slug ]->cancel_subscription( $entry, $feed ); |
| 261 | 261 | |
| 262 | - return \GFAPI::get_entry( $entry['id'] ); |
|
| 262 | + return \GFAPI::get_entry( $entry[ 'id' ] ); |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | } |