@@ -41,8 +41,8 @@ discard block |
||
| 41 | 41 | 'detail' => null, |
| 42 | 42 | ) ); |
| 43 | 43 | |
| 44 | - if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) { |
|
| 45 | - if ( $atts['detail'] && $view = $request->is_view() ) { |
|
| 44 | + if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) { |
|
| 45 | + if ( $atts[ 'detail' ] && $view = $request->is_view() ) { |
|
| 46 | 46 | $view_id = $view->ID; |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -111,12 +111,12 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 114 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | 117 | * View details. |
| 118 | 118 | */ |
| 119 | - if ( $atts['detail'] ) { |
|
| 119 | + if ( $atts[ 'detail' ] ) { |
|
| 120 | 120 | return self::_return( $this->detail( $view, $entries, $atts ) ); |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | return self::_return( '' ); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - if ( $entry['status'] != 'active' ) { |
|
| 135 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 136 | 136 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 137 | 137 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
| 138 | 138 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 146 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 146 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 147 | 147 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 148 | 148 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
| 149 | 149 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | return self::_return( '' ); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - if ( $entry['status'] != 'active' ) { |
|
| 166 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 167 | 167 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 168 | 168 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
| 169 | 169 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 177 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 177 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 178 | 178 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 179 | 179 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
| 180 | 180 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | $error = \GVCommon::check_entry_display( $entry->as_entry() ); |
| 184 | 184 | |
| 185 | - if( is_wp_error( $error ) ) { |
|
| 185 | + if ( is_wp_error( $error ) ) { |
|
| 186 | 186 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) ); |
| 187 | 187 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
| 188 | 188 | } |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | // Mock the request with the actual View, not the global one |
| 200 | 200 | $mock_request = new \GV\Mock_Request(); |
| 201 | - $mock_request->returns['is_view'] = $view; |
|
| 202 | - $mock_request->returns['is_entry'] = $request->is_entry(); |
|
| 203 | - $mock_request->returns['is_edit_entry'] = $request->is_edit_entry(); |
|
| 204 | - $mock_request->returns['is_search'] = $request->is_search(); |
|
| 201 | + $mock_request->returns[ 'is_view' ] = $view; |
|
| 202 | + $mock_request->returns[ 'is_entry' ] = $request->is_entry(); |
|
| 203 | + $mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry(); |
|
| 204 | + $mock_request->returns[ 'is_search' ] = $request->is_search(); |
|
| 205 | 205 | |
| 206 | 206 | $request = $mock_request; |
| 207 | 207 | } |
@@ -237,16 +237,16 @@ discard block |
||
| 237 | 237 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
| 238 | 238 | |
| 239 | 239 | // Only keep the passed attributes after making sure that they're valid pairs |
| 240 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
| 240 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
| 241 | 241 | |
| 242 | 242 | $atts = array(); |
| 243 | 243 | |
| 244 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
| 244 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
| 245 | 245 | |
| 246 | 246 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
| 247 | 247 | $passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value ); |
| 248 | 248 | |
| 249 | - switch( $defaults[ $key ]['type'] ) { |
|
| 249 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
| 250 | 250 | |
| 251 | 251 | /** |
| 252 | 252 | * Make sure number fields are numeric. |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
| 255 | 255 | */ |
| 256 | 256 | case 'number': |
| 257 | - if( is_numeric( $passed_value ) ) { |
|
| 257 | + if ( is_numeric( $passed_value ) ) { |
|
| 258 | 258 | $atts[ $key ] = ( $passed_value + 0 ); |
| 259 | 259 | } |
| 260 | 260 | break; |
@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | */ |
| 270 | 270 | case 'select': |
| 271 | 271 | case 'radio': |
| 272 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
| 273 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 272 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
| 273 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 274 | 274 | $atts[ $key ] = $passed_value; |
| 275 | 275 | } |
| 276 | 276 | break; |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | } |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - $atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
| 285 | + $atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
| 286 | 286 | |
| 287 | 287 | return $atts; |
| 288 | 288 | } |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | private function detail( $view, $entries, $atts ) { |
| 300 | 300 | $output = ''; |
| 301 | 301 | |
| 302 | - switch ( $key = $atts['detail'] ): |
|
| 302 | + switch ( $key = $atts[ 'detail' ] ): |
|
| 303 | 303 | case 'total_entries': |
| 304 | 304 | $output = number_format_i18n( $entries->total() ); |
| 305 | 305 | break; |