|
@@ -47,16 +47,16 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
|