From 1f39a9c50b24dd9f314ce3672912854d057b6c72 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 11 Oct 2017 14:32:17 +0300 Subject: [PATCH] - fixed clean temp directory on file uploads; --- includes/core/class-access.php | 7 +++++-- includes/core/um-actions-user.php | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/includes/core/class-access.php b/includes/core/class-access.php index 907658cc..343a783a 100644 --- a/includes/core/class-access.php +++ b/includes/core/class-access.php @@ -292,13 +292,16 @@ if ( ! class_exists( 'Access' ) ) { continue; } - $user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] ); - if ( $user_can ) { + if ( ! empty( $restriction['_um_access_roles'] ) ) + $user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] ); + + if ( isset( $user_can ) && $user_can ) { $filtered_posts[] = $post; continue; } + if ( ! $query->is_singular ) { //if not single query when exclude if set _um_access_hide_from_queries if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { diff --git a/includes/core/um-actions-user.php b/includes/core/um-actions-user.php index 34c76ce4..b5c503c6 100644 --- a/includes/core/um-actions-user.php +++ b/includes/core/um-actions-user.php @@ -30,29 +30,30 @@ } - /*** - *** @after user uploads, clean up uploads dir - ***/ - add_action('um_after_user_upload','um_remove_unused_uploads', 10); - function um_remove_unused_uploads( $user_id ) { + /** + * Clean user temp uploads + * + * @param $user_id + * @param $array + */ + function um_remove_unused_uploads( $user_id, $array ) { um_fetch_user( $user_id ); - $array = UM()->user()->profile; - - $files = glob( um_user_uploads_dir() . '*', GLOB_BRACE); + $files = glob( um_user_uploads_dir() . '*', GLOB_BRACE ); if ( file_exists( um_user_uploads_dir() ) && $files && isset( $array ) && is_array( $array ) ) { + foreach ( $files as $file ) { + $str = basename( $file ); - foreach($files as $file) { - $str = basename($file); - if ( !strstr( $str, 'profile_photo') && !strstr( $str, 'cover_photo') && !strstr( $str, 'stream_photo') && !preg_grep('/' . $str . '/', $array ) ) + if ( ! strstr( $str, 'profile_photo' ) && ! strstr( $str, 'cover_photo' ) && + ! strstr( $str, 'stream_photo' ) && ! preg_grep( '/' . $str . '/', array_values( $array ) ) ) unlink( $file ); } - } - } + add_action( 'um_after_user_upload','um_remove_unused_uploads', 10, 2 ); + /*** *** @adds main links to a logout widget