@@ -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' ), |
@@ -47,16 +47,16 @@ 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 | if ( class_exists( '\GF_Query' ) ) { |
| 62 | 62 | /** |
@@ -65,17 +65,17 @@ discard block |
||
| 65 | 65 | * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here. |
| 66 | 66 | */ |
| 67 | 67 | add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) { |
| 68 | - if ( ! empty( $parameters['sorting'] ) ) { |
|
| 68 | + if ( ! empty( $parameters[ 'sorting' ] ) ) { |
|
| 69 | 69 | /** |
| 70 | 70 | * Reverse existing sorts. |
| 71 | 71 | */ |
| 72 | - $sort = &$parameters['sorting']; |
|
| 73 | - $sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' ); |
|
| 72 | + $sort = &$parameters[ 'sorting' ]; |
|
| 73 | + $sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' ); |
|
| 74 | 74 | } else { |
| 75 | 75 | /** |
| 76 | 76 | * Otherwise, sort by date_created. |
| 77 | 77 | */ |
| 78 | - $parameters['sorting'] = array( |
|
| 78 | + $parameters[ 'sorting' ] = array( |
|
| 79 | 79 | 'key' => 'id', |
| 80 | 80 | 'direction' => 'ASC', |
| 81 | 81 | 'is_numeric' => true |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | /** If a sort already exists, reverse it. */ |
| 92 | 92 | if ( $sort = end( $entries->sorts ) ) { |
| 93 | - $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 ); |
|
| 93 | + $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 ); |
|
| 94 | 94 | } else { |
| 95 | 95 | /** Otherwise, sort by date_created */ |
| 96 | 96 | $entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC ); |
@@ -108,12 +108,12 @@ discard block |
||
| 108 | 108 | break; |
| 109 | 109 | default: |
| 110 | 110 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
| 111 | - gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) ); |
|
| 111 | + gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
| 112 | 112 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts ); |
| 113 | 113 | } |
| 114 | 114 | endswitch; |
| 115 | 115 | |
| 116 | - if ( $view->form->ID != $entry['form_id'] ) { |
|
| 116 | + if ( $view->form->ID != $entry[ 'form_id' ] ) { |
|
| 117 | 117 | gravityview()->log->error( 'Entry does not belong to view (form mismatch)' ); |
| 118 | 118 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 119 | 119 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts ); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if ( ! $view->form ) { |
|
| 126 | + if ( ! $view->form ) { |
|
| 127 | 127 | gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) ); |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -146,43 +146,43 @@ discard block |
||
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | /** Unapproved entries. */ |
| 149 | - if ( $entry['status'] != 'active' ) { |
|
| 149 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 150 | 150 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 151 | 151 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 154 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 155 | 155 | |
| 156 | 156 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 157 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 157 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 158 | 158 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 159 | 159 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - if ( $atts['edit'] ) { |
|
| 163 | + if ( $atts[ 'edit' ] ) { |
|
| 164 | 164 | /** |
| 165 | 165 | * Based on code in our unit-tests. |
| 166 | 166 | * Mocks old context, etc. |
| 167 | 167 | */ |
| 168 | 168 | $loader = \GravityView_Edit_Entry::getInstance(); |
| 169 | - $render = $loader->instances['render']; |
|
| 169 | + $render = $loader->instances[ 'render' ]; |
|
| 170 | 170 | |
| 171 | 171 | add_filter( 'gravityview/is_single_entry', '__return_true' ); |
| 172 | 172 | |
| 173 | - $form = \GFAPI::get_form( $entry['form_id'] ); |
|
| 173 | + $form = \GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 174 | 174 | |
| 175 | 175 | $data = \GravityView_View_Data::getInstance( $view ); |
| 176 | 176 | $template = \GravityView_View::getInstance( array( |
| 177 | 177 | 'form' => $form, |
| 178 | - 'form_id' => $form['id'], |
|
| 178 | + 'form_id' => $form[ 'id' ], |
|
| 179 | 179 | 'view_id' => $view->ID, |
| 180 | 180 | 'entries' => array( $entry ), |
| 181 | 181 | 'atts' => \GVCommon::get_template_settings( $view->ID ), |
| 182 | 182 | ) ); |
| 183 | 183 | |
| 184 | - $_GET['edit'] = wp_create_nonce( |
|
| 185 | - \GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] ) |
|
| 184 | + $_GET[ 'edit' ] = wp_create_nonce( |
|
| 185 | + \GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] ) |
|
| 186 | 186 | ); |
| 187 | 187 | |
| 188 | 188 | add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) { |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts ); |
| 200 | 200 | } ); |
| 201 | 201 | |
| 202 | - ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view ); |
|
| 202 | + ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view ); |
|
| 203 | 203 | $output = ob_get_clean(); // Render :) |
| 204 | 204 | |
| 205 | 205 | remove_filter( 'gravityview/is_single_entry', '__return_true' ); |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $renderer = new \GV\Entry_Renderer(); |
| 212 | 212 | |
| 213 | 213 | $request = new \GV\Mock_Request(); |
| 214 | - $request->returns['is_entry'] = $entry; |
|
| 214 | + $request->returns[ 'is_entry' ] = $entry; |
|
| 215 | 215 | |
| 216 | 216 | $output = $renderer->render( $entry, $view, $request ); |
| 217 | 217 | |
@@ -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 | * |
@@ -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 |
@@ -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 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * |
| 88 | 88 | * @param array $file_paths List of template paths ordered |
| 89 | 89 | * |
| 90 | - * @return array File paths, with duplicate field path added at index 117 |
|
| 90 | + * @return string[] File paths, with duplicate field path added at index 117 |
|
| 91 | 91 | */ |
| 92 | 92 | public function add_template_path( $file_paths ) { |
| 93 | 93 | |
@@ -193,7 +193,6 @@ discard block |
||
| 193 | 193 | * @since 2.5 |
| 194 | 194 | * |
| 195 | 195 | * @param array $visibility_caps Array of capabilities to display in field dropdown. |
| 196 | - * @param string $field_type Type of field options to render (`field` or `widget`) |
|
| 197 | 196 | * @param string $template_id Table slug |
| 198 | 197 | * @param float|string $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
| 199 | 198 | * @param string $context What context are we in? Example: `single` or `directory` |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public static function get_duplicate_link( $entry, $view_id, $post_id = null ) { |
| 248 | 248 | |
| 249 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 249 | + $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 250 | 250 | |
| 251 | 251 | if ( empty( $base ) ) { |
| 252 | 252 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | 'action' => 'duplicate', |
| 258 | 258 | 'entry_id' => $entry['id'], |
| 259 | 259 | 'gvid' => $view_id, |
| 260 | - 'view_id' => $view_id, |
|
| 260 | + 'view_id' => $view_id, |
|
| 261 | 261 | ), $base ); |
| 262 | 262 | |
| 263 | 263 | return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl ); |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | * @since 2.5 |
| 461 | 461 | * @param array $duplicated_entry The duplicated entry |
| 462 | 462 | * @param array $entry The original entry |
| 463 | - */ |
|
| 463 | + */ |
|
| 464 | 464 | do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry ); |
| 465 | 465 | |
| 466 | 466 | gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) ); |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 116 | 116 | |
| 117 | 117 | // Always a link, never a filter, always same window |
| 118 | - unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] ); |
|
| 118 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] ); |
|
| 119 | 119 | |
| 120 | 120 | // Duplicate Entry link should only appear to visitors capable of editing entries |
| 121 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 121 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
| 122 | 122 | |
| 123 | - $add_option['duplicate_link'] = array( |
|
| 123 | + $add_option[ 'duplicate_link' ] = array( |
|
| 124 | 124 | 'type' => 'text', |
| 125 | 125 | 'label' => __( 'Duplicate Link Text', 'gravityview' ), |
| 126 | 126 | 'desc' => NULL, |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | 'merge_tags' => true, |
| 129 | 129 | ); |
| 130 | 130 | |
| 131 | - $field_options['allow_duplicate_cap'] = array( |
|
| 131 | + $field_options[ 'allow_duplicate_cap' ] = array( |
|
| 132 | 132 | 'type' => 'select', |
| 133 | 133 | 'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ), |
| 134 | 134 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
| 156 | 156 | |
| 157 | 157 | if ( 'edit' !== $zone ) { |
| 158 | - $entry_default_fields['duplicate_link'] = array( |
|
| 158 | + $entry_default_fields[ 'duplicate_link' ] = array( |
|
| 159 | 159 | 'label' => __( 'Duplicate Entry', 'gravityview' ), |
| 160 | 160 | 'type' => 'duplicate_link', |
| 161 | 161 | 'desc' => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ), |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function add_available_field( $available_fields = array() ) { |
| 178 | 178 | |
| 179 | - $available_fields['duplicate_link'] = array( |
|
| 179 | + $available_fields[ 'duplicate_link' ] = array( |
|
| 180 | 180 | 'label_text' => __( 'Duplicate Entry', 'gravityview' ), |
| 181 | 181 | 'field_id' => 'duplicate_link', |
| 182 | 182 | 'label_type' => 'field', |
@@ -209,9 +209,9 @@ discard block |
||
| 209 | 209 | if ( 'duplicate_link' === $field_id ) { |
| 210 | 210 | |
| 211 | 211 | // Remove other built-in caps. |
| 212 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] ); |
|
| 212 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] ); |
|
| 213 | 213 | |
| 214 | - $caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
| 214 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | return $caps; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public static function get_duplicate_link( $entry, $view_id, $post_id = null ) { |
| 248 | 248 | |
| 249 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 249 | + $base = GravityView_API::directory_link( $post_id ?: $view_id, true ); |
|
| 250 | 250 | |
| 251 | 251 | if ( empty( $base ) ) { |
| 252 | 252 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -255,12 +255,12 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | $actionurl = add_query_arg( array( |
| 257 | 257 | 'action' => 'duplicate', |
| 258 | - 'entry_id' => $entry['id'], |
|
| 258 | + 'entry_id' => $entry[ 'id' ], |
|
| 259 | 259 | 'gvid' => $view_id, |
| 260 | 260 | 'view_id' => $view_id, |
| 261 | 261 | ), $base ); |
| 262 | 262 | |
| 263 | - return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl ); |
|
| 263 | + return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl ); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
@@ -281,12 +281,12 @@ discard block |
||
| 281 | 281 | public function process_duplicate() { |
| 282 | 282 | |
| 283 | 283 | // If the form is submitted |
| 284 | - if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) { |
|
| 284 | + if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) { |
|
| 285 | 285 | return; |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | // Make sure it's a GravityView request |
| 289 | - $valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) ); |
|
| 289 | + $valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) ); |
|
| 290 | 290 | |
| 291 | 291 | if ( ! $valid_nonce_key ) { |
| 292 | 292 | gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' ); |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | // Get the entry slug |
| 297 | - $entry_slug = esc_attr( $_GET['entry_id'] ); |
|
| 297 | + $entry_slug = esc_attr( $_GET[ 'entry_id' ] ); |
|
| 298 | 298 | |
| 299 | 299 | // See if there's an entry there |
| 300 | 300 | $entry = gravityview_get_entry( $entry_slug, true, false ); |
@@ -388,15 +388,15 @@ discard block |
||
| 388 | 388 | return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) ); |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - $row['id'] = null; |
|
| 392 | - $row['date_created'] = date( 'Y-m-d H:i:s', time() ); |
|
| 393 | - $row['date_updated'] = $row['date_created']; |
|
| 394 | - $row['is_starred'] = false; |
|
| 395 | - $row['is_read'] = false; |
|
| 396 | - $row['ip'] = GFFormsModel::get_ip(); |
|
| 397 | - $row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) ); |
|
| 398 | - $row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' ); |
|
| 399 | - $row['created_by'] = wp_get_current_user()->ID; |
|
| 391 | + $row[ 'id' ] = null; |
|
| 392 | + $row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() ); |
|
| 393 | + $row[ 'date_updated' ] = $row[ 'date_created' ]; |
|
| 394 | + $row[ 'is_starred' ] = false; |
|
| 395 | + $row[ 'is_read' ] = false; |
|
| 396 | + $row[ 'ip' ] = GFFormsModel::get_ip(); |
|
| 397 | + $row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) ); |
|
| 398 | + $row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' ); |
|
| 399 | + $row[ 'created_by' ] = wp_get_current_user()->ID; |
|
| 400 | 400 | |
| 401 | 401 | /** |
| 402 | 402 | * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created. |
@@ -424,15 +424,15 @@ discard block |
||
| 424 | 424 | |
| 425 | 425 | $save_this_meta = array(); |
| 426 | 426 | foreach ( $duplicate_meta->get_output() as $m ) { |
| 427 | - $save_this_meta[] = array( |
|
| 428 | - 'meta_key' => $m['meta_key'], |
|
| 429 | - 'meta_value' => $m['meta_value'], |
|
| 430 | - 'item_index' => $m['item_index'], |
|
| 427 | + $save_this_meta[ ] = array( |
|
| 428 | + 'meta_key' => $m[ 'meta_key' ], |
|
| 429 | + 'meta_value' => $m[ 'meta_value' ], |
|
| 430 | + 'item_index' => $m[ 'item_index' ], |
|
| 431 | 431 | ); |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | // Update the row ID for later usage |
| 435 | - $row['id'] = $duplicated_id; |
|
| 435 | + $row[ 'id' ] = $duplicated_id; |
|
| 436 | 436 | |
| 437 | 437 | /** |
| 438 | 438 | * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details. |
@@ -443,8 +443,8 @@ discard block |
||
| 443 | 443 | $save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry ); |
| 444 | 444 | |
| 445 | 445 | foreach ( $save_this_meta as $data ) { |
| 446 | - $data['form_id'] = $entry['form_id']; |
|
| 447 | - $data['entry_id'] = $duplicated_id; |
|
| 446 | + $data[ 'form_id' ] = $entry[ 'form_id' ]; |
|
| 447 | + $data[ 'entry_id' ] = $duplicated_id; |
|
| 448 | 448 | |
| 449 | 449 | if ( ! $wpdb->insert( $entry_meta_table, $data ) ) { |
| 450 | 450 | return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) ); |
@@ -478,13 +478,13 @@ discard block |
||
| 478 | 478 | public function verify_nonce() { |
| 479 | 479 | |
| 480 | 480 | // No duplicate entry request was made |
| 481 | - if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) { |
|
| 481 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) { |
|
| 482 | 482 | return false; |
| 483 | 483 | } |
| 484 | 484 | |
| 485 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
| 485 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
| 486 | 486 | |
| 487 | - $valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key ); |
|
| 487 | + $valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key ); |
|
| 488 | 488 | |
| 489 | 489 | /** |
| 490 | 490 | * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid. |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | return ''; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | - return 'return window.confirm(\''. esc_js( $confirm ) .'\');'; |
|
| 523 | + return 'return window.confirm(\'' . esc_js( $confirm ) . '\');'; |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | /** |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) { |
| 575 | 575 | $current_user = wp_get_current_user(); |
| 576 | 576 | |
| 577 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : null; |
|
| 577 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null; |
|
| 578 | 578 | |
| 579 | 579 | // Or if they can duplicate any entries (as defined in Gravity Forms), we're good. |
| 580 | 580 | if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) { |
@@ -589,17 +589,17 @@ discard block |
||
| 589 | 589 | if ( ! empty( $field ) ) { |
| 590 | 590 | |
| 591 | 591 | // If capability is not defined, something is not right! |
| 592 | - if ( empty( $field['allow_duplicate_cap'] ) ) { |
|
| 592 | + if ( empty( $field[ 'allow_duplicate_cap' ] ) ) { |
|
| 593 | 593 | |
| 594 | 594 | gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) ); |
| 595 | 595 | |
| 596 | 596 | return false; |
| 597 | 597 | } |
| 598 | 598 | |
| 599 | - if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) { |
|
| 599 | + if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) { |
|
| 600 | 600 | |
| 601 | 601 | // Do not return true if cap is read, as we need to check if the current user created the entry |
| 602 | - if ( 'read' !== $field['allow_duplicate_cap'] ) { |
|
| 602 | + if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) { |
|
| 603 | 603 | return true; |
| 604 | 604 | } |
| 605 | 605 | |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | |
| 613 | 613 | } |
| 614 | 614 | |
| 615 | - if ( ! isset( $entry['created_by'] ) ) { |
|
| 615 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
| 616 | 616 | |
| 617 | 617 | gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' ); |
| 618 | 618 | |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | } |
| 638 | 638 | |
| 639 | 639 | // If the logged-in user is the same as the user who created the entry, we're good. |
| 640 | - if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 640 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
| 641 | 641 | |
| 642 | 642 | gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) ); |
| 643 | 643 | |
@@ -661,12 +661,12 @@ discard block |
||
| 661 | 661 | * @return void |
| 662 | 662 | */ |
| 663 | 663 | public function maybe_display_message( $current_view_id = 0 ) { |
| 664 | - if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
| 664 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
| 665 | 665 | return; |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | // Entry wasn't duplicated from current View |
| 669 | - if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) { |
|
| 669 | + if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) { |
|
| 670 | 670 | return; |
| 671 | 671 | } |
| 672 | 672 | |
@@ -674,11 +674,11 @@ discard block |
||
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | public function display_message() { |
| 677 | - if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) { |
|
| 677 | + if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) { |
|
| 678 | 678 | return; |
| 679 | 679 | } |
| 680 | 680 | |
| 681 | - $status = esc_attr( $_GET['status'] ); |
|
| 681 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
| 682 | 682 | $message_from_url = \GV\Utils::_GET( 'message' ); |
| 683 | 683 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
| 684 | 684 | $class = ''; |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | $message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url ); |
| 705 | 705 | |
| 706 | 706 | // DISPLAY ERROR/SUCCESS MESSAGE |
| 707 | - echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>'; |
|
| 707 | + echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>'; |
|
| 708 | 708 | } |
| 709 | 709 | |
| 710 | 710 | /** |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | ?> |
| 736 | 736 | <span class="duplicate"> |
| 737 | 737 | | |
| 738 | - <a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a> |
|
| 738 | + <a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a> |
|
| 739 | 739 | </span> |
| 740 | 740 | <?php |
| 741 | 741 | } |
@@ -757,9 +757,9 @@ discard block |
||
| 757 | 757 | |
| 758 | 758 | if ( 'success' === \GV\Utils::_GET( 'result' ) ) { |
| 759 | 759 | add_filter( 'gform_admin_messages', function( $messages ) { |
| 760 | - $messages = (array) $messages; |
|
| 760 | + $messages = (array)$messages; |
|
| 761 | 761 | |
| 762 | - $messages[] = esc_html__( 'Entry duplicated.', 'gravityview' ); |
|
| 762 | + $messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' ); |
|
| 763 | 763 | return $messages; |
| 764 | 764 | } ); |
| 765 | 765 | } |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | |
| 771 | 771 | $check_logs_message = ''; |
| 772 | 772 | |
| 773 | - if( $is_logging_active ) { |
|
| 773 | + if ( $is_logging_active ) { |
|
| 774 | 774 | $check_logs_message = sprintf( ' <a href="%s">%s</a>', |
| 775 | 775 | esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ), |
| 776 | 776 | esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' ) |
@@ -778,9 +778,9 @@ discard block |
||
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) { |
| 781 | - $messages = (array) $messages; |
|
| 781 | + $messages = (array)$messages; |
|
| 782 | 782 | |
| 783 | - $messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message; |
|
| 783 | + $messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message; |
|
| 784 | 784 | |
| 785 | 785 | return $messages; |
| 786 | 786 | } ); |
@@ -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 | } |
@@ -262,6 +262,8 @@ |
||
| 262 | 262 | /** |
| 263 | 263 | * Process the attributes passed to the shortcode. Make sure they're valid |
| 264 | 264 | * |
| 265 | + * @param string $content |
|
| 266 | + * @param string $tag |
|
| 265 | 267 | * @return array Array of attributes parsed for the shortcode |
| 266 | 268 | */ |
| 267 | 269 | private function parse_atts( $atts, $content, $tag ) { |
@@ -58,13 +58,13 @@ discard block |
||
| 58 | 58 | $value = $this->get_value( $atts ); |
| 59 | 59 | |
| 60 | 60 | if ( false === $operator && is_null( $value ) ) { |
| 61 | - if ( false !== $atts['if'] ) { // Only-if test |
|
| 62 | - $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
|
| 61 | + if ( false !== $atts[ 'if' ] ) { // Only-if test |
|
| 62 | + $match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) ); |
|
| 63 | 63 | } else { |
| 64 | 64 | $match = $authed; // Just login test |
| 65 | 65 | } |
| 66 | 66 | } else { // Regular test |
| 67 | - $match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator ); |
|
| 67 | + $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator ); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $output = $this->get_output( $match, $atts, $content ); |
@@ -150,8 +150,8 @@ discard block |
||
| 150 | 150 | * @return string The output. |
| 151 | 151 | */ |
| 152 | 152 | private function get_output( $match, $atts, $content ) { |
| 153 | - if ( ! $match && ! empty( $atts['else'] ) ) { |
|
| 154 | - return $atts['else']; // Attributized else is easy :) |
|
| 153 | + if ( ! $match && ! empty( $atts[ 'else' ] ) ) { |
|
| 154 | + return $atts[ 'else' ]; // Attributized else is easy :) |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | $if = ''; |
@@ -278,18 +278,18 @@ discard block |
||
| 278 | 278 | $atts = array_intersect_key( $supplied_atts, $atts ); |
| 279 | 279 | |
| 280 | 280 | // Strip whitespace if it's not default false |
| 281 | - if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) { |
|
| 282 | - $atts['if'] = trim( $atts['if'] ); |
|
| 281 | + if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) { |
|
| 282 | + $atts[ 'if' ] = trim( $atts[ 'if' ] ); |
|
| 283 | 283 | } else { |
| 284 | - $atts['if'] = false; |
|
| 284 | + $atts[ 'if' ] = false; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - if ( isset( $atts['logged_in'] ) ) { |
|
| 287 | + if ( isset( $atts[ 'logged_in' ] ) ) { |
|
| 288 | 288 | // Truthy |
| 289 | - if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) { |
|
| 290 | - $atts['logged_in'] = false; |
|
| 289 | + if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) { |
|
| 290 | + $atts[ 'logged_in' ] = false; |
|
| 291 | 291 | } else { |
| 292 | - $atts['logged_in'] = true; |
|
| 292 | + $atts[ 'logged_in' ] = true; |
|
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | |
@@ -58,12 +58,14 @@ discard block |
||
| 58 | 58 | $value = $this->get_value( $atts ); |
| 59 | 59 | |
| 60 | 60 | if ( false === $operator && is_null( $value ) ) { |
| 61 | - if ( false !== $atts['if'] ) { // Only-if test |
|
| 61 | + if ( false !== $atts['if'] ) { |
|
| 62 | +// Only-if test |
|
| 62 | 63 | $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
| 63 | 64 | } else { |
| 64 | 65 | $match = $authed; // Just login test |
| 65 | 66 | } |
| 66 | - } else { // Regular test |
|
| 67 | + } else { |
|
| 68 | +// Regular test |
|
| 67 | 69 | $match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator ); |
| 68 | 70 | } |
| 69 | 71 | |
@@ -160,12 +162,15 @@ discard block |
||
| 160 | 162 | $opens = 0; // inner opens |
| 161 | 163 | $found = false; // found split position |
| 162 | 164 | |
| 163 | - while ( $content ) { // scan |
|
| 165 | + while ( $content ) { |
|
| 166 | +// scan |
|
| 164 | 167 | |
| 165 | 168 | if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) { |
| 166 | - if ( ! $found ) { // We're still iffing. |
|
| 169 | + if ( ! $found ) { |
|
| 170 | +// We're still iffing. |
|
| 167 | 171 | $if .= $content; |
| 168 | - } else { // We are elsing |
|
| 172 | + } else { |
|
| 173 | +// We are elsing |
|
| 169 | 174 | $else .= $content; |
| 170 | 175 | } |
| 171 | 176 | break; // No more shortcodes |
@@ -173,9 +178,11 @@ discard block |
||
| 173 | 178 | |
| 174 | 179 | list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches; |
| 175 | 180 | |
| 176 | - if ( ! $found ) { // We're still iffing. |
|
| 181 | + if ( ! $found ) { |
|
| 182 | +// We're still iffing. |
|
| 177 | 183 | $if .= $before_shortcode; |
| 178 | - } else { // We are elsing |
|
| 184 | + } else { |
|
| 185 | +// We are elsing |
|
| 179 | 186 | $else .= $before_shortcode; |
| 180 | 187 | } |
| 181 | 188 | |
@@ -199,9 +206,11 @@ discard block |
||
| 199 | 206 | } |
| 200 | 207 | |
| 201 | 208 | // Tack on the shortcode |
| 202 | - if ( ! $found ) { // We're still iffing. |
|
| 209 | + if ( ! $found ) { |
|
| 210 | +// We're still iffing. |
|
| 203 | 211 | $if .= $shortcode; |
| 204 | - } else { // We are elsing |
|
| 212 | + } else { |
|
| 213 | +// We are elsing |
|
| 205 | 214 | $else .= $shortcode; |
| 206 | 215 | } |
| 207 | 216 | } |
@@ -9,9 +9,9 @@ discard block |
||
| 9 | 9 | $gravityview_view = GravityView_View::getInstance(); |
| 10 | 10 | |
| 11 | 11 | $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' ); |
| 12 | -$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) ); |
|
| 12 | +$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) ); |
|
| 13 | 13 | |
| 14 | -if( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) { |
|
| 14 | +if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) { |
|
| 15 | 15 | return; |
| 16 | 16 | } |
| 17 | 17 | |
@@ -25,20 +25,20 @@ discard block |
||
| 25 | 25 | do_action( 'gravityview/field/notes/scripts' ); |
| 26 | 26 | |
| 27 | 27 | $entry = $gravityview_view->getCurrentEntry(); |
| 28 | -$notes = (array) GravityView_Entry_Notes::get_notes( $entry['id'] ); |
|
| 28 | +$notes = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] ); |
|
| 29 | 29 | $strings = GravityView_Field_Notes::strings(); |
| 30 | -$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 30 | +$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 31 | 31 | |
| 32 | -$show_add = ! empty( $visibility_settings['add'] ); |
|
| 33 | -$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) ); |
|
| 34 | -$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) ); |
|
| 32 | +$show_add = ! empty( $visibility_settings[ 'add' ] ); |
|
| 33 | +$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) ); |
|
| 34 | +$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) ); |
|
| 35 | 35 | |
| 36 | 36 | $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' ); |
| 37 | 37 | $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes'; |
| 38 | 38 | ?> |
| 39 | 39 | <div class="gv-notes <?php echo $container_class; ?>"> |
| 40 | 40 | <?php |
| 41 | - if( $show_notes ) { |
|
| 41 | + if ( $show_notes ) { |
|
| 42 | 42 | ?> |
| 43 | 43 | <form method="post" class="gv-notes-list"> |
| 44 | 44 | <?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?> |
@@ -46,21 +46,21 @@ discard block |
||
| 46 | 46 | <input type="hidden" name="action" value="gv_delete_notes" /> |
| 47 | 47 | <input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" /> |
| 48 | 48 | <table> |
| 49 | - <caption><?php echo $strings['caption']; ?></caption> |
|
| 49 | + <caption><?php echo $strings[ 'caption' ]; ?></caption> |
|
| 50 | 50 | <?php |
| 51 | 51 | if ( $show_delete ) { |
| 52 | 52 | ?> |
| 53 | 53 | <thead> |
| 54 | 54 | <tr> |
| 55 | 55 | <th colspan="2"> |
| 56 | - <label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label> |
|
| 57 | - <button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button> |
|
| 56 | + <label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label> |
|
| 57 | + <button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button> |
|
| 58 | 58 | </th> |
| 59 | 59 | </tr> |
| 60 | 60 | </thead> |
| 61 | 61 | <?php } ?> |
| 62 | 62 | <tbody> |
| 63 | - <tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr> |
|
| 63 | + <tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr> |
|
| 64 | 64 | <?php |
| 65 | 65 | foreach ( $notes as $note ) { |
| 66 | 66 | echo GravityView_Field_Notes::display_note( $note, $show_delete ); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | <?php |
| 74 | 74 | } // End if can view notes |
| 75 | 75 | |
| 76 | - if( $show_add ) { |
|
| 76 | + if ( $show_add ) { |
|
| 77 | 77 | echo do_shortcode( '[gv_note_add]' ); |
| 78 | 78 | } |
| 79 | 79 | ?> |