| @@ -4,20 +4,16 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmEntriesController { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @return void | |
| 10 | - */ | |
| 11 | 8 | public static function menu() { |
| 12 | 9 | FrmAppHelper::force_capability( 'frm_view_entries' ); |
| 13 | 10 | |
| 14 | - add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 11 | + add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' ); | |
| 15 | 12 | |
| 16 | 13 | $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) && FrmProAppHelper::views_is_installed(); |
| 17 | - | |
| 18 | 14 | if ( ! $views_installed ) { |
| 19 | - add_submenu_page( 'formidable', 'Formidable | ' . __( 'Views', 'formidable' ), __( 'Views', 'formidable' ), 'frm_view_entries', 'formidable-views', 'FrmFormsController::no_views' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 15 | + add_submenu_page( 'formidable', 'Formidable | ' . __( 'Views', 'formidable' ), __( 'Views', 'formidable' ), 'frm_view_entries', 'formidable-views', 'FrmFormsController::no_views' ); | |
| 20 | 16 | self::maybe_redirect_to_views_upsell(); |
| 21 | 17 | } else { |
| 22 | 18 | self::maybe_redirect_to_views_index(); |
| 23 | 19 | } |
| @@ -61,9 +57,8 @@ | ||
| 61 | 57 | * @return void |
| 62 | 58 | */ |
| 63 | 59 | private static function maybe_redirect_to_views_upsell() { |
| 64 | 60 | global $pagenow; |
| 65 | - | |
| 66 | 61 | if ( 'edit.php' !== $pagenow || 'frm_display' !== FrmAppHelper::simple_get( 'post_type' ) ) { |
| 67 | 62 | return; |
| 68 | 63 | } |
| 69 | 64 | |
| @@ -79,15 +74,14 @@ | ||
| 79 | 74 | /** |
| 80 | 75 | * @since 6.14.1 |
| 81 | 76 | * |
| 82 | 77 | * @param array $query_args |
| 83 | - * | |
| 84 | 78 | * @return array |
| 85 | 79 | */ |
| 86 | 80 | private static function add_url_params_to_views_redirect_query_args( $query_args ) { |
| 87 | 81 | $query_args['show_nav'] = FrmAppHelper::simple_get( 'show_nav', 'absint', 0 ); |
| 88 | - $form_id = FrmAppHelper::simple_get( 'form', 'absint', 0 ); | |
| 89 | 82 | |
| 83 | + $form_id = FrmAppHelper::simple_get( 'form', 'absint', 0 ); | |
| 90 | 84 | if ( $form_id ) { |
| 91 | 85 | $query_args['form'] = $form_id; |
| 92 | 86 | } |
| 93 | 87 | |
| @@ -95,10 +89,8 @@ | ||
| 95 | 89 | } |
| 96 | 90 | |
| 97 | 91 | /** |
| 98 | 92 | * @since 2.05.07 |
| 99 | - * | |
| 100 | - * @return void | |
| 101 | 93 | */ |
| 102 | 94 | private static function load_manage_entries_hooks() { |
| 103 | 95 | if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show', 'new', 'duplicate' ), true ) ) { |
| 104 | 96 | $menu_name = FrmAppHelper::get_menu_name(); |
| @@ -107,16 +99,14 @@ | ||
| 107 | 99 | add_filter( 'manage_' . $base . '_columns', 'FrmEntriesController::manage_columns' ); |
| 108 | 100 | add_filter( 'get_user_option_' . self::hidden_column_key( $menu_name ), 'FrmEntriesController::hidden_columns' ); |
| 109 | 101 | add_filter( 'manage_' . $base . '_sortable_columns', 'FrmEntriesController::sortable_columns' ); |
| 110 | 102 | } else { |
| 111 | - add_filter( 'screen_options_show_screen', self::class . '::remove_screen_options', 10, 2 ); | |
| 103 | + add_filter( 'screen_options_show_screen', __CLASS__ . '::remove_screen_options', 10, 2 ); | |
| 112 | 104 | } |
| 113 | 105 | } |
| 114 | 106 | |
| 115 | 107 | /** |
| 116 | 108 | * Display in Back End. |
| 117 | - * | |
| 118 | - * @return mixed | |
| 119 | 109 | */ |
| 120 | 110 | public static function route() { |
| 121 | 111 | $action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' ); |
| 122 | 112 | FrmAppHelper::include_svg(); |
| @@ -127,15 +117,13 @@ | ||
| 127 | 117 | return self::$action(); |
| 128 | 118 | |
| 129 | 119 | default: |
| 130 | 120 | do_action( 'frm_entry_action_route', $action ); |
| 131 | - | |
| 132 | 121 | if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) { |
| 133 | - return null; | |
| 122 | + return; | |
| 134 | 123 | } |
| 135 | 124 | |
| 136 | - self::display_list(); | |
| 137 | - return null; | |
| 125 | + return self::display_list(); | |
| 138 | 126 | } |
| 139 | 127 | } |
| 140 | 128 | |
| 141 | 129 | /** |
| @@ -142,30 +130,18 @@ | ||
| 142 | 130 | * Prevent the "screen options" tab from showing when |
| 143 | 131 | * editing or creating an entry |
| 144 | 132 | * |
| 145 | 133 | * @since 3.0 |
| 146 | - * | |
| 147 | - * @param bool $show_screen Whether to show the screen options tab. | |
| 148 | - * @param object $screen The current screen object. | |
| 149 | - * | |
| 150 | - * @return bool | |
| 151 | 134 | */ |
| 152 | 135 | public static function remove_screen_options( $show_screen, $screen ) { |
| 153 | - $menu_name = sanitize_title( FrmAppHelper::get_menu_name() ); | |
| 154 | - $unread_count = FrmEntriesHelper::get_visible_unread_inbox_count(); | |
| 155 | - | |
| 156 | - if ( $screen->id === $menu_name . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries' ) { | |
| 157 | - return false; | |
| 136 | + $menu_name = sanitize_title( FrmAppHelper::get_menu_name() ); | |
| 137 | + if ( $screen->id == $menu_name . '_page_formidable-entries' ) { | |
| 138 | + $show_screen = false; | |
| 158 | 139 | } |
| 159 | 140 | |
| 160 | 141 | return $show_screen; |
| 161 | 142 | } |
| 162 | 143 | |
| 163 | - /** | |
| 164 | - * @param array $columns | |
| 165 | - * | |
| 166 | - * @return array | |
| 167 | - */ | |
| 168 | 144 | public static function manage_columns( $columns ) { |
| 169 | 145 | global $frm_vars; |
| 170 | 146 | $form_id = FrmForm::get_current_form_id(); |
| 171 | 147 | |
| @@ -185,11 +161,11 @@ | ||
| 185 | 161 | $columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' ); |
| 186 | 162 | self::maybe_add_ip_col( $form_id, $columns ); |
| 187 | 163 | |
| 188 | 164 | $frm_vars['cols'] = $columns; |
| 189 | - $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 190 | 165 | |
| 191 | - if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ), true ) ) { | |
| 166 | + $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 167 | + if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) { | |
| 192 | 168 | add_screen_option( |
| 193 | 169 | 'per_page', |
| 194 | 170 | array( |
| 195 | 171 | 'label' => esc_html__( 'Entries', 'formidable' ), |
| @@ -201,14 +177,8 @@ | ||
| 201 | 177 | |
| 202 | 178 | return $columns; |
| 203 | 179 | } |
| 204 | 180 | |
| 205 | - /** | |
| 206 | - * @param int|string $form_id | |
| 207 | - * @param array $columns | |
| 208 | - * | |
| 209 | - * @return void | |
| 210 | - */ | |
| 211 | 181 | private static function get_columns_for_form( $form_id, &$columns ) { |
| 212 | 182 | $form_cols = FrmField::get_all_for_form( $form_id, '', 'include' ); |
| 213 | 183 | |
| 214 | 184 | /** |
| @@ -226,9 +196,8 @@ | ||
| 226 | 196 | continue; |
| 227 | 197 | } |
| 228 | 198 | |
| 229 | 199 | $has_child_fields = $form_col->type === 'form' && ! empty( $form_col->field_options['form_select'] ); |
| 230 | - | |
| 231 | 200 | if ( $has_child_fields ) { |
| 232 | 201 | self::add_subform_cols( $form_col, $form_id, $columns ); |
| 233 | 202 | } else { |
| 234 | 203 | self::add_field_cols( $form_col, $form_id, $columns ); |
| @@ -237,19 +206,12 @@ | ||
| 237 | 206 | } |
| 238 | 207 | |
| 239 | 208 | /** |
| 240 | 209 | * @since 3.01 |
| 241 | - * | |
| 242 | - * @param object $field The field object. | |
| 243 | - * @param int|string $form_id The form ID. | |
| 244 | - * @param array $columns The columns array. | |
| 245 | - * | |
| 246 | - * @return void | |
| 247 | 210 | */ |
| 248 | 211 | private static function add_subform_cols( $field, $form_id, &$columns ) { |
| 249 | 212 | $sub_form_cols = FrmField::get_all_for_form( $field->field_options['form_select'] ); |
| 250 | - | |
| 251 | - if ( ! $sub_form_cols ) { | |
| 213 | + if ( empty( $sub_form_cols ) ) { | |
| 252 | 214 | return; |
| 253 | 215 | } |
| 254 | 216 | |
| 255 | 217 | foreach ( $sub_form_cols as $k => $sub_form_col ) { |
| @@ -256,9 +218,8 @@ | ||
| 256 | 218 | if ( FrmField::is_no_save_field( $sub_form_col->type ) ) { |
| 257 | 219 | unset( $sub_form_cols[ $k ] ); |
| 258 | 220 | continue; |
| 259 | 221 | } |
| 260 | - | |
| 261 | 222 | $columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 ); |
| 262 | 223 | unset( $sub_form_col ); |
| 263 | 224 | } |
| 264 | 225 | } |
| @@ -264,62 +225,24 @@ | ||
| 264 | 225 | } |
| 265 | 226 | |
| 266 | 227 | /** |
| 267 | 228 | * @since 3.01 |
| 268 | - * | |
| 269 | - * @param object $field The field object. | |
| 270 | - * @param int|string $form_id The form ID. | |
| 271 | - * @param array $columns The columns array. | |
| 272 | - * | |
| 273 | - * @return void | |
| 274 | 229 | */ |
| 275 | 230 | private static function add_field_cols( $field, $form_id, &$columns ) { |
| 276 | 231 | $col_id = $field->field_key; |
| 277 | - | |
| 278 | - if ( (int) $field->form_id !== (int) $form_id ) { | |
| 232 | + if ( $field->form_id != $form_id ) { | |
| 279 | 233 | $col_id .= '-_-form' . $field->form_id; |
| 280 | 234 | } |
| 281 | 235 | |
| 282 | - $has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' ); | |
| 283 | - $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status'; | |
| 284 | - $include_column_for_sep_val = $has_separate_value && ! $is_post_status; | |
| 285 | - | |
| 286 | - if ( $include_column_for_sep_val ) { | |
| 287 | - $columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val ); | |
| 236 | + $has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' ); | |
| 237 | + $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status'; | |
| 238 | + if ( $has_separate_value && ! $is_post_status ) { | |
| 239 | + $columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 ); | |
| 288 | 240 | } |
| 289 | 241 | |
| 290 | - $columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false ); | |
| 242 | + $columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 ); | |
| 291 | 243 | } |
| 292 | 244 | |
| 293 | - /** | |
| 294 | - * Appends "(Value)" or "(Label)" to the field name if it's an option field that has a separate value/label. | |
| 295 | - * | |
| 296 | - * @since 6.25.1 | |
| 297 | - * | |
| 298 | - * @param object $field | |
| 299 | - * @param bool $include_column_for_sep_val | |
| 300 | - * @param bool $is_value | |
| 301 | - * | |
| 302 | - * @return string | |
| 303 | - */ | |
| 304 | - private static function maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, $is_value = true ) { | |
| 305 | - $field_name = FrmAppHelper::truncate( $field->name, 35 ); | |
| 306 | - | |
| 307 | - if ( ! $include_column_for_sep_val || ! in_array( $field->type, array( 'select', 'radio', 'checkbox' ), true ) ) { | |
| 308 | - return $field_name; | |
| 309 | - } | |
| 310 | - | |
| 311 | - $append_text = $is_value ? esc_html__( 'value', 'formidable' ) : esc_html__( 'label', 'formidable' ); | |
| 312 | - | |
| 313 | - return sprintf( '%s (%s)', $field_name, $append_text ); | |
| 314 | - } | |
| 315 | - | |
| 316 | - /** | |
| 317 | - * @param int|string $form_id The form ID. | |
| 318 | - * @param array $columns The columns array. | |
| 319 | - * | |
| 320 | - * @return void | |
| 321 | - */ | |
| 322 | 245 | private static function maybe_add_ip_col( $form_id, &$columns ) { |
| 323 | 246 | if ( FrmAppHelper::ips_saved() ) { |
| 324 | 247 | $columns[ $form_id . '_ip' ] = 'IP'; |
| 325 | 248 | } |
| @@ -324,26 +247,15 @@ | ||
| 324 | 247 | $columns[ $form_id . '_ip' ] = 'IP'; |
| 325 | 248 | } |
| 326 | 249 | } |
| 327 | 250 | |
| 328 | - /** | |
| 329 | - * @param bool $check The check value. | |
| 330 | - * @param int $object_id The object ID. | |
| 331 | - * @param string $meta_key The meta key. | |
| 332 | - * @param mixed $meta_value The meta value. | |
| 333 | - * @param mixed $prev_value The previous value. | |
| 334 | - * | |
| 335 | - * @return bool | |
| 336 | - */ | |
| 337 | 251 | public static function check_hidden_cols( $check, $object_id, $meta_key, $meta_value, $prev_value ) { |
| 338 | 252 | $this_page_name = self::hidden_column_key(); |
| 339 | - | |
| 340 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 341 | 253 | if ( $meta_key != $this_page_name || $meta_value == $prev_value ) { |
| 342 | 254 | return $check; |
| 343 | 255 | } |
| 344 | 256 | |
| 345 | - if ( ! $prev_value ) { | |
| 257 | + if ( empty( $prev_value ) ) { | |
| 346 | 258 | $prev_value = get_metadata( 'user', $object_id, $meta_key, true ); |
| 347 | 259 | } |
| 348 | 260 | |
| 349 | 261 | global $frm_vars; |
| @@ -354,27 +266,17 @@ | ||
| 354 | 266 | } |
| 355 | 267 | |
| 356 | 268 | /** |
| 357 | 269 | * Add hidden columns back from other forms |
| 358 | - * | |
| 359 | - * @param int $meta_id The meta ID. | |
| 360 | - * @param int $object_id The object ID. | |
| 361 | - * @param string $meta_key The meta key. | |
| 362 | - * @param array $meta_value The meta value. | |
| 363 | - * | |
| 364 | - * @return void | |
| 365 | 270 | */ |
| 366 | 271 | public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $meta_value ) { |
| 367 | 272 | $this_page_name = self::hidden_column_key(); |
| 368 | - | |
| 369 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 370 | 273 | if ( $meta_key != $this_page_name ) { |
| 371 | 274 | return; |
| 372 | 275 | } |
| 373 | 276 | |
| 374 | 277 | global $frm_vars; |
| 375 | - | |
| 376 | - if ( empty( $frm_vars['prev_hidden_cols'] ) ) { | |
| 278 | + if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) { | |
| 377 | 279 | // Don't continue if there's no previous value. |
| 378 | 280 | return; |
| 379 | 281 | } |
| 380 | 282 | |
| @@ -379,9 +281,9 @@ | ||
| 379 | 281 | } |
| 380 | 282 | |
| 381 | 283 | foreach ( $meta_value as $mk => $mv ) { |
| 382 | 284 | // Remove blank values. |
| 383 | - if ( ! $mv ) { | |
| 285 | + if ( empty( $mv ) ) { | |
| 384 | 286 | unset( $meta_value[ $mk ] ); |
| 385 | 287 | } |
| 386 | 288 | } |
| 387 | 289 | |
| @@ -390,10 +292,9 @@ | ||
| 390 | 292 | $cur_form_prefix = $cur_form_prefix[0]; |
| 391 | 293 | $save = false; |
| 392 | 294 | |
| 393 | 295 | foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) { |
| 394 | - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 395 | - if ( ! $prev_hidden || in_array( $prev_hidden, $meta_value ) ) { | |
| 296 | + if ( empty( $prev_hidden ) || in_array( $prev_hidden, $meta_value ) ) { | |
| 396 | 297 | // Don't add blank cols or process included cols. |
| 397 | 298 | continue; |
| 398 | 299 | } |
| 399 | 300 | |
| @@ -398,10 +299,9 @@ | ||
| 398 | 299 | } |
| 399 | 300 | |
| 400 | 301 | $form_prefix = explode( '_', $prev_hidden ); |
| 401 | 302 | $form_prefix = $form_prefix[0]; |
| 402 | - | |
| 403 | - if ( $form_prefix === $cur_form_prefix ) { | |
| 303 | + if ( $form_prefix == $cur_form_prefix ) { | |
| 404 | 304 | // Don't add back columns that are meant to be hidden. |
| 405 | 305 | continue; |
| 406 | 306 | } |
| 407 | 307 | |
| @@ -409,63 +309,42 @@ | ||
| 409 | 309 | $save = true; |
| 410 | 310 | unset( $form_prefix ); |
| 411 | 311 | } |
| 412 | 312 | |
| 413 | - if ( ! $save ) { | |
| 414 | - return; | |
| 313 | + if ( $save ) { | |
| 314 | + $user_id = get_current_user_id(); | |
| 315 | + update_user_option( $user_id, $this_page_name, $meta_value, true ); | |
| 415 | 316 | } |
| 416 | - | |
| 417 | - $user_id = get_current_user_id(); | |
| 418 | - update_user_option( $user_id, $this_page_name, $meta_value, true ); | |
| 419 | 317 | } |
| 420 | 318 | |
| 421 | 319 | /** |
| 422 | 320 | * @since 2.05.07 |
| 423 | - * | |
| 424 | - * @param string $menu_name | |
| 425 | - * | |
| 426 | - * @return string | |
| 427 | 321 | */ |
| 428 | 322 | private static function hidden_column_key( $menu_name = '' ) { |
| 429 | 323 | $base = self::base_column_key( $menu_name ); |
| 324 | + | |
| 430 | 325 | return 'manage' . $base . 'columnshidden'; |
| 431 | 326 | } |
| 432 | 327 | |
| 433 | 328 | /** |
| 434 | 329 | * @since 2.05.07 |
| 435 | - * | |
| 436 | - * @param string $menu_name | |
| 437 | - * | |
| 438 | - * @return string | |
| 439 | 330 | */ |
| 440 | 331 | private static function base_column_key( $menu_name = '' ) { |
| 441 | - if ( ! $menu_name ) { | |
| 332 | + if ( empty( $menu_name ) ) { | |
| 442 | 333 | $menu_name = FrmAppHelper::get_menu_name(); |
| 443 | 334 | } |
| 444 | 335 | |
| 445 | - $unread_count = FrmEntriesHelper::get_visible_unread_inbox_count(); | |
| 446 | - | |
| 447 | - return sanitize_title( $menu_name ) . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries'; | |
| 336 | + return sanitize_title( $menu_name ) . '_page_formidable-entries'; | |
| 448 | 337 | } |
| 449 | 338 | |
| 450 | - /** | |
| 451 | - * @param int $save | |
| 452 | - * @param string $option | |
| 453 | - * @param string $value | |
| 454 | - * | |
| 455 | - * @return int | |
| 456 | - */ | |
| 457 | 339 | public static function save_per_page( $save, $option, $value ) { |
| 458 | 340 | if ( $option === 'formidable_page_formidable_entries_per_page' ) { |
| 459 | - return (int) $value; | |
| 341 | + $save = (int) $value; | |
| 460 | 342 | } |
| 461 | 343 | |
| 462 | 344 | return $save; |
| 463 | 345 | } |
| 464 | 346 | |
| 465 | - /** | |
| 466 | - * @return array | |
| 467 | - */ | |
| 468 | 347 | public static function sortable_columns() { |
| 469 | 348 | $form_id = FrmForm::get_current_form_id(); |
| 470 | 349 | $fields = FrmField::get_all_for_form( $form_id ); |
| 471 | 350 | |
| @@ -497,9 +376,8 @@ | ||
| 497 | 376 | * Can't sort on checkboxes because they are sorted serialized. |
| 498 | 377 | * Some post content can be sorted but not everything. |
| 499 | 378 | * |
| 500 | 379 | * @param stdClass $field |
| 501 | - * | |
| 502 | 380 | * @return bool |
| 503 | 381 | */ |
| 504 | 382 | private static function field_supports_sorting( $field ) { |
| 505 | 383 | $is_sortable = 'checkbox' !== $field->type && empty( $field->field_options['post_field'] ); |
| @@ -507,14 +385,11 @@ | ||
| 507 | 385 | } |
| 508 | 386 | |
| 509 | 387 | /** |
| 510 | 388 | * @param mixed $result Option value from database for hidden columns in entries table. |
| 511 | - * | |
| 512 | 389 | * @return array |
| 513 | 390 | */ |
| 514 | 391 | public static function hidden_columns( $result ) { |
| 515 | - global $frm_vars; | |
| 516 | - | |
| 517 | 392 | if ( ! is_array( $result ) ) { |
| 518 | 393 | // Force an unexpected value to be an array. |
| 519 | 394 | // Since $result is a filtered option and gets saved to the database, it's possible it could be a string. |
| 520 | 395 | // Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error. |
| @@ -520,16 +395,21 @@ | ||
| 520 | 395 | // Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error. |
| 521 | 396 | $result = array(); |
| 522 | 397 | } |
| 523 | 398 | |
| 524 | - $form_id = FrmForm::get_current_form_id(); | |
| 525 | - $hidden = self::user_hidden_columns_for_form( $form_id, $result ); | |
| 526 | - $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0; | |
| 527 | - $max_columns = 11; | |
| 399 | + $form_id = FrmForm::get_current_form_id(); | |
| 528 | 400 | |
| 529 | - if ( $hidden ) { | |
| 530 | - $result = $hidden; | |
| 531 | - $i = $i - count( $result ); | |
| 401 | + $hidden = self::user_hidden_columns_for_form( $form_id, $result ); | |
| 402 | + | |
| 403 | + global $frm_vars; | |
| 404 | + $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0; | |
| 405 | + | |
| 406 | + if ( ! empty( $hidden ) ) { | |
| 407 | + $result = $hidden; | |
| 408 | + $i = $i - count( $result ); | |
| 409 | + $max_columns = 11; | |
| 410 | + } else { | |
| 411 | + $max_columns = 8; | |
| 532 | 412 | } |
| 533 | 413 | |
| 534 | 414 | if ( $i <= $max_columns ) { |
| 535 | 415 | return $result; |
| @@ -541,19 +421,13 @@ | ||
| 541 | 421 | } |
| 542 | 422 | |
| 543 | 423 | /** |
| 544 | 424 | * @since 2.05.07 |
| 545 | - * | |
| 546 | - * @param int|string $form_id | |
| 547 | - * @param mixed $result | |
| 548 | - * | |
| 549 | - * @return array | |
| 550 | 425 | */ |
| 551 | 426 | private static function user_hidden_columns_for_form( $form_id, $result ) { |
| 552 | 427 | $hidden = array(); |
| 553 | - | |
| 554 | 428 | foreach ( (array) $result as $r ) { |
| 555 | - if ( $r ) { | |
| 429 | + if ( ! empty( $r ) ) { | |
| 556 | 430 | list( $form_prefix, $field_key ) = explode( '_', $r ); |
| 557 | 431 | |
| 558 | 432 | if ( (int) $form_prefix === (int) $form_id ) { |
| 559 | 433 | $hidden[] = $r; |
| @@ -569,13 +443,8 @@ | ||
| 569 | 443 | /** |
| 570 | 444 | * Remove some columns by default when there are too many |
| 571 | 445 | * |
| 572 | 446 | * @since 2.05.07 |
| 573 | - * | |
| 574 | - * @param array $atts | |
| 575 | - * @param array $result | |
| 576 | - * | |
| 577 | - * @return void | |
| 578 | 447 | */ |
| 579 | 448 | private static function remove_excess_cols( $atts, &$result ) { |
| 580 | 449 | global $frm_vars; |
| 581 | 450 | |
| @@ -583,16 +452,17 @@ | ||
| 583 | 452 | $atts['form_id'] . '_item_key' => '', |
| 584 | 453 | $atts['form_id'] . '_id' => '', |
| 585 | 454 | ); |
| 586 | 455 | $cols = $remove_first + array_reverse( $frm_vars['cols'], true ); |
| 587 | - $i = $atts['i']; | |
| 588 | 456 | |
| 457 | + $i = $atts['i']; | |
| 458 | + | |
| 589 | 459 | foreach ( $cols as $col_key => $col ) { |
| 590 | 460 | if ( $i <= $atts['max_columns'] ) { |
| 591 | 461 | break; |
| 592 | 462 | } |
| 593 | 463 | |
| 594 | - if ( ! $result || ! in_array( $col_key, $result, true ) ) { | |
| 464 | + if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) { | |
| 595 | 465 | $result[] = $col_key; |
| 596 | 466 | --$i; |
| 597 | 467 | } |
| 598 | 468 | |
| @@ -599,14 +469,8 @@ | ||
| 599 | 469 | unset( $col_key, $col ); |
| 600 | 470 | } |
| 601 | 471 | } |
| 602 | 472 | |
| 603 | - /** | |
| 604 | - * @param string $message | |
| 605 | - * @param array $errors | |
| 606 | - * | |
| 607 | - * @return void | |
| 608 | - */ | |
| 609 | 473 | public static function display_list( $message = '', $errors = array() ) { |
| 610 | 474 | global $wpdb, $frm_vars; |
| 611 | 475 | |
| 612 | 476 | $form = FrmForm::maybe_get_current_form(); |
| @@ -618,29 +482,28 @@ | ||
| 618 | 482 | |
| 619 | 483 | self::get_delete_form_time( $form, $errors ); |
| 620 | 484 | } |
| 621 | 485 | |
| 622 | - $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' ); | |
| 486 | + $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' ); | |
| 487 | + | |
| 623 | 488 | $wp_list_table = new $table_class( array( 'params' => $params ) ); |
| 624 | - $pagenum = $wp_list_table->get_pagenum(); | |
| 625 | 489 | |
| 490 | + $pagenum = $wp_list_table->get_pagenum(); | |
| 491 | + | |
| 626 | 492 | $wp_list_table->prepare_items(); |
| 627 | 493 | |
| 628 | 494 | $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' ); |
| 629 | - | |
| 630 | 495 | if ( $pagenum > $total_pages && $total_pages > 0 ) { |
| 631 | 496 | $url = add_query_arg( 'paged', $total_pages ); |
| 632 | - | |
| 633 | 497 | if ( headers_sent() ) { |
| 634 | 498 | FrmAppHelper::js_redirect( $url, true ); |
| 635 | 499 | } else { |
| 636 | - wp_safe_redirect( esc_url_raw( $url ) ); | |
| 500 | + wp_redirect( esc_url_raw( $url ) ); | |
| 637 | 501 | } |
| 638 | - | |
| 639 | 502 | die(); |
| 640 | 503 | } |
| 641 | 504 | |
| 642 | - if ( ! $message && isset( $_GET['import-message'] ) ) { | |
| 505 | + if ( empty( $message ) && isset( $_GET['import-message'] ) ) { | |
| 643 | 506 | $message = __( 'Your import is complete', 'formidable' ); |
| 644 | 507 | } |
| 645 | 508 | |
| 646 | 509 | require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php'; |
| @@ -645,18 +508,12 @@ | ||
| 645 | 508 | |
| 646 | 509 | require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php'; |
| 647 | 510 | } |
| 648 | 511 | |
| 649 | - /** | |
| 650 | - * @param object $form | |
| 651 | - * @param array $errors | |
| 652 | - * | |
| 653 | - * @return void | |
| 654 | - */ | |
| 655 | 512 | private static function get_delete_form_time( $form, &$errors ) { |
| 656 | 513 | if ( 'trash' === $form->status ) { |
| 657 | 514 | $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS ); |
| 658 | - $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, $form->options['trash_time'] ?? time() ); | |
| 515 | + $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? $form->options['trash_time'] : time() ) ); | |
| 659 | 516 | |
| 660 | 517 | /* translators: %1$s: Time string */ |
| 661 | 518 | $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete ); |
| 662 | 519 | } |
| @@ -663,12 +520,8 @@ | ||
| 663 | 520 | } |
| 664 | 521 | |
| 665 | 522 | /** |
| 666 | 523 | * Back End CRUD. |
| 667 | - * | |
| 668 | - * @param int $id | |
| 669 | - * | |
| 670 | - * @return void | |
| 671 | 524 | */ |
| 672 | 525 | public static function show( $id = 0 ) { |
| 673 | 526 | FrmAppHelper::permission_check( 'frm_view_entries' ); |
| 674 | 527 | |
| @@ -680,9 +533,8 @@ | ||
| 680 | 533 | } |
| 681 | 534 | } |
| 682 | 535 | |
| 683 | 536 | $entry = FrmEntry::getOne( $id, true ); |
| 684 | - | |
| 685 | 537 | if ( ! $entry ) { |
| 686 | 538 | FrmAppController::show_error_modal( |
| 687 | 539 | array( |
| 688 | 540 | 'title' => __( 'You can\'t view the entry', 'formidable' ), |
| @@ -693,9 +545,8 @@ | ||
| 693 | 545 | return; |
| 694 | 546 | } |
| 695 | 547 | |
| 696 | 548 | $data = $entry->description; |
| 697 | - | |
| 698 | 549 | if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) { |
| 699 | 550 | $data = array( 'referrer' => $data ); |
| 700 | 551 | } |
| 701 | 552 | |
| @@ -712,9 +563,8 @@ | ||
| 712 | 563 | * @return void |
| 713 | 564 | */ |
| 714 | 565 | public static function destroy() { |
| 715 | 566 | $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_entries', '_wpnonce', -1 ); |
| 716 | - | |
| 717 | 567 | if ( false !== $permission_error ) { |
| 718 | 568 | $error_args = array( |
| 719 | 569 | 'title' => __( 'Verification failed', 'formidable' ), |
| 720 | 570 | 'body' => $permission_error, |
| @@ -725,14 +575,13 @@ | ||
| 725 | 575 | } |
| 726 | 576 | |
| 727 | 577 | $params = FrmForm::get_admin_params(); |
| 728 | 578 | |
| 729 | - if ( ! empty( $params['keep_post'] ) ) { | |
| 579 | + if ( isset( $params['keep_post'] ) && $params['keep_post'] ) { | |
| 730 | 580 | self::unlink_post( $params['id'] ); |
| 731 | 581 | } |
| 732 | 582 | |
| 733 | 583 | $message = ''; |
| 734 | - | |
| 735 | 584 | if ( FrmEntry::destroy( $params['id'] ) ) { |
| 736 | 585 | $message = __( 'Entry was successfully deleted', 'formidable' ); |
| 737 | 586 | } |
| 738 | 587 | |
| @@ -738,18 +587,11 @@ | ||
| 738 | 587 | |
| 739 | 588 | self::display_list( $message ); |
| 740 | 589 | } |
| 741 | 590 | |
| 742 | - /** | |
| 743 | - * @param array|string $errors | |
| 744 | - * @param bool $ajax | |
| 745 | - * | |
| 746 | - * @return void | |
| 747 | - */ | |
| 748 | 591 | public static function process_entry( $errors = '', $ajax = false ) { |
| 749 | 592 | $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' ); |
| 750 | - | |
| 751 | - if ( FrmAppHelper::is_admin() || empty( $_POST ) || ! $form_id || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 593 | + if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 752 | 594 | return; |
| 753 | 595 | } |
| 754 | 596 | |
| 755 | 597 | global $frm_vars; |
| @@ -754,19 +596,12 @@ | ||
| 754 | 596 | |
| 755 | 597 | global $frm_vars; |
| 756 | 598 | |
| 757 | 599 | $form = FrmForm::getOne( $form_id ); |
| 758 | - | |
| 759 | 600 | if ( ! $form ) { |
| 760 | 601 | return; |
| 761 | 602 | } |
| 762 | 603 | |
| 763 | - $is_preview = 'frm_forms_preview' === FrmAppHelper::simple_get( 'action' ); | |
| 764 | - | |
| 765 | - if ( $is_preview && FrmFormsHelper::should_block_preview( $form->form_key ) ) { | |
| 766 | - return; | |
| 767 | - } | |
| 768 | - | |
| 769 | 604 | $params = FrmForm::get_params( $form ); |
| 770 | 605 | |
| 771 | 606 | if ( ! isset( $frm_vars['form_params'] ) ) { |
| 772 | 607 | $frm_vars['form_params'] = array(); |
| @@ -776,9 +611,8 @@ | ||
| 776 | 611 | if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) { |
| 777 | 612 | return; |
| 778 | 613 | } |
| 779 | 614 | |
| 780 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 781 | 615 | if ( $errors == '' && ! $ajax ) { |
| 782 | 616 | $errors = FrmEntryValidate::validate( wp_unslash( $_POST ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 783 | 617 | } |
| 784 | 618 | |
| @@ -791,30 +625,26 @@ | ||
| 791 | 625 | $errors = apply_filters( 'frm_entries_before_create', $errors, $form ); |
| 792 | 626 | |
| 793 | 627 | $frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors ); |
| 794 | 628 | |
| 795 | - if ( $errors ) { | |
| 796 | - return; | |
| 797 | - } | |
| 629 | + if ( empty( $errors ) ) { | |
| 630 | + $_POST['frm_skip_cookie'] = 1; | |
| 631 | + $do_success = false; | |
| 632 | + if ( $params['action'] === 'create' ) { | |
| 633 | + if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) { | |
| 634 | + $frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 798 | 635 | |
| 799 | - $_POST['frm_skip_cookie'] = 1; | |
| 800 | - $do_success = false; | |
| 636 | + $params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id']; | |
| 637 | + $do_success = true; | |
| 638 | + } | |
| 639 | + } | |
| 801 | 640 | |
| 802 | - if ( $params['action'] === 'create' ) { | |
| 803 | - if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) { | |
| 804 | - $frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 805 | - | |
| 806 | - $params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id']; | |
| 807 | - $do_success = true; | |
| 641 | + do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) ); | |
| 642 | + if ( $do_success ) { | |
| 643 | + FrmFormsController::maybe_trigger_redirect( $form, $params, array( 'ajax' => $ajax ) ); | |
| 808 | 644 | } |
| 645 | + unset( $_POST['frm_skip_cookie'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 809 | 646 | } |
| 810 | - | |
| 811 | - do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) ); | |
| 812 | - | |
| 813 | - if ( $do_success ) { | |
| 814 | - FrmFormsController::maybe_trigger_redirect( $form, $params, array( 'ajax' => $ajax ) ); | |
| 815 | - } | |
| 816 | - unset( $_POST['frm_skip_cookie'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 817 | 647 | } |
| 818 | 648 | |
| 819 | 649 | /** |
| 820 | 650 | * Escape url entities before redirect |
| @@ -828,19 +658,11 @@ | ||
| 828 | 658 | public static function prepare_redirect_url( $url ) { |
| 829 | 659 | return str_replace( array( ' ', '[', ']', '|', '@' ), array( '%20', '%5B', '%5D', '%7C', '%40' ), $url ); |
| 830 | 660 | } |
| 831 | 661 | |
| 832 | - /** | |
| 833 | - * Delete entry if redirected. | |
| 834 | - * | |
| 835 | - * @param string $url | |
| 836 | - * @param object $form | |
| 837 | - * @param array $atts | |
| 838 | - * | |
| 839 | - * @return string | |
| 840 | - */ | |
| 841 | 662 | public static function delete_entry_before_redirect( $url, $form, $atts ) { |
| 842 | 663 | self::_delete_entry( $atts['id'], $form ); |
| 664 | + | |
| 843 | 665 | return $url; |
| 844 | 666 | } |
| 845 | 667 | |
| 846 | 668 | /** |
| @@ -846,23 +668,13 @@ | ||
| 846 | 668 | /** |
| 847 | 669 | * Delete entry if not redirected. |
| 848 | 670 | * |
| 849 | 671 | * @param array $atts |
| 850 | - * | |
| 851 | - * @return void | |
| 852 | 672 | */ |
| 853 | 673 | public static function delete_entry_after_save( $atts ) { |
| 854 | 674 | self::_delete_entry( $atts['entry_id'], $atts['form'] ); |
| 855 | 675 | } |
| 856 | 676 | |
| 857 | - /** | |
| 858 | - * Delete entry if not redirected. | |
| 859 | - * | |
| 860 | - * @param int $entry_id | |
| 861 | - * @param object $form | |
| 862 | - * | |
| 863 | - * @return void | |
| 864 | - */ | |
| 865 | 677 | private static function _delete_entry( $entry_id, $form ) { |
| 866 | 678 | if ( ! $form ) { |
| 867 | 679 | return; |
| 868 | 680 | } |
| @@ -867,23 +679,16 @@ | ||
| 867 | 679 | return; |
| 868 | 680 | } |
| 869 | 681 | |
| 870 | 682 | FrmAppHelper::unserialize_or_decode( $form->options ); |
| 871 | - | |
| 872 | - if ( empty( $form->options['no_save'] ) ) { | |
| 873 | - return; | |
| 683 | + if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) { | |
| 684 | + self::unlink_post( $entry_id ); | |
| 685 | + FrmEntry::destroy( $entry_id ); | |
| 874 | 686 | } |
| 875 | - | |
| 876 | - self::unlink_post( $entry_id ); | |
| 877 | - FrmEntry::destroy( $entry_id ); | |
| 878 | 687 | } |
| 879 | 688 | |
| 880 | 689 | /** |
| 881 | 690 | * Unlink entry from post |
| 882 | - * | |
| 883 | - * @param int $entry_id | |
| 884 | - * | |
| 885 | - * @return void | |
| 886 | 691 | */ |
| 887 | 692 | private static function unlink_post( $entry_id ) { |
| 888 | 693 | global $wpdb; |
| 889 | 694 | $wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $entry_id ) ); |
| @@ -919,9 +724,8 @@ | ||
| 919 | 724 | 'exclude_fields' => '', |
| 920 | 725 | 'include_fields' => '', |
| 921 | 726 | 'include_extras' => '', |
| 922 | 727 | 'inline_style' => 1, |
| 923 | - 'table_style' => '', | |
| 924 | 728 | // Return embedded fields as nested array. |
| 925 | 729 | 'child_array' => false, |
| 926 | 730 | 'line_breaks' => true, |
| 927 | 731 | 'array_separator' => ', ', |
| @@ -926,32 +730,34 @@ | ||
| 926 | 730 | 'line_breaks' => true, |
| 927 | 731 | 'array_separator' => ', ', |
| 928 | 732 | ); |
| 929 | 733 | $defaults = apply_filters( 'frm_show_entry_defaults', $defaults ); |
| 930 | - $atts = shortcode_atts( $defaults, $atts ); | |
| 931 | 734 | |
| 735 | + $atts = shortcode_atts( $defaults, $atts ); | |
| 736 | + | |
| 932 | 737 | if ( $atts['default_email'] ) { |
| 933 | - $shortcode_atts = array( | |
| 738 | + $shortcode_atts = array( | |
| 934 | 739 | 'format' => $atts['format'], |
| 935 | 740 | 'plain_text' => $atts['plain_text'], |
| 936 | 741 | ); |
| 742 | + | |
| 937 | 743 | $entry_formatter = FrmEntryFactory::entry_shortcode_formatter_instance( $atts['form_id'], $shortcode_atts ); |
| 938 | - return $entry_formatter->content(); | |
| 744 | + $formatted_entry = $entry_formatter->content(); | |
| 745 | + | |
| 746 | + } else { | |
| 747 | + | |
| 748 | + $entry_formatter = FrmEntryFactory::entry_formatter_instance( $atts ); | |
| 749 | + $formatted_entry = $entry_formatter->get_formatted_entry_values(); | |
| 750 | + | |
| 939 | 751 | } |
| 940 | 752 | |
| 941 | - $entry_formatter = FrmEntryFactory::entry_formatter_instance( $atts ); | |
| 942 | - | |
| 943 | - return $entry_formatter->get_formatted_entry_values(); | |
| 753 | + return $formatted_entry; | |
| 944 | 754 | } |
| 945 | 755 | |
| 946 | - /** | |
| 947 | - * @param false|object $entry | |
| 948 | - * | |
| 949 | - * @return void | |
| 950 | - */ | |
| 951 | 756 | public static function entry_sidebar( $entry = false ) { |
| 952 | - $data = array(); | |
| 953 | - $id = 0; | |
| 757 | + $data = array(); | |
| 758 | + $id = 0; | |
| 759 | + | |
| 954 | 760 | $date_format = get_option( 'date_format' ); |
| 955 | 761 | $time_format = get_option( 'time_format' ); |
| 956 | 762 | |
| 957 | 763 | if ( $entry ) { |
| @@ -956,9 +762,8 @@ | ||
| 956 | 762 | |
| 957 | 763 | if ( $entry ) { |
| 958 | 764 | $id = $entry->id; |
| 959 | 765 | $data = $entry->description; |
| 960 | - | |
| 961 | 766 | if ( isset( $data['browser'] ) ) { |
| 962 | 767 | $browser = FrmEntriesHelper::get_browser( $data['browser'] ); |
| 963 | 768 | } |
| 964 | 769 | /** |
