Changeset 2552518

Timestamp:

06/23/2021 08:34:27 AM (5 years ago)

Author:

msh134

Message:

Minor fixes

Location:

wp-upload-restriction/trunk

Files:

• readme.txt (modified) (2 diffs)
• screenshot-1.png (deleted)
• screenshot-2.png (deleted)
• wp-upload-restriction.php (modified) (11 diffs)

wp-upload-restriction/trunk/readme.txt

@@ -3 +3 @@
 Tags: upload, media, developer tool
 Tested up to: 5.7.2
-Stable tag: 2.2.2
+Stable tag: 2.2.3
 License: GPLv2 or later
 
@@ -33 +33 @@
 
 == Changelog ==
-= 2.2.0 =
+= 2.2.3 =
+* Minor fixes.
+
+= 2.2.2 =
 * New feature: Added option for selecting file size unit (MB and KB).
 * Compatibility check.

wp-upload-restriction/trunk/wp-upload-restriction.php

@@ -4 +4 @@
   Plugin URI: https://wordpress.org/plugins/wp-upload-restriction/
   Description: This plugin allows you to control upload of files based on file types and sizes.
-  Version: 2.2.2
+  Version: 2.2.3
   Author: Sajjad Hossain
   Author URI: http://www.sajjadhossain.com
@@ -80 +80 @@
         $user_roles = $user->roles;
 
+        if(empty($user_roles)){
+            return $mimes;
+        }
+
         $selected_mimes = array();
-        $has_setup = TRUE;
+        $has_setup = false;
         
         foreach ($user_roles as $role){
-            $roles_selected_mimes = get_option('wpur_selected_mimes_' . $role, FALSE);
-
-            if($roles_selected_mimes !== FALSE){
+            $roles_selected_mimes = get_option('wpur_selected_mimes_' . $role, false);
+
+            if($roles_selected_mimes !== false){
                 $selected_mimes = array_merge($selected_mimes, $roles_selected_mimes);
-                $has_setup = TRUE;
-            }
-            elseif(!$$has_setup){
-                $has_setup = FALSE;
+                $has_setup = true;
             }
         }
@@ -126 +127 @@
         if($current_user->roles){
             $upload_size = 0;
-            $restrict = FALSE;
+            $restrict = false;
         
             foreach($current_user->roles as $role){
                 if($this->isUploadSizeRestricted($role)){
-                    $allowed_size = $this->getRoleMaxUploadSize($role, TRUE);                
+                    $allowed_size = $this->getRoleMaxUploadSize($role, true);                
                     $upload_size = max(array($upload_size, $allowed_size));
-                    $restrict = TRUE;
+                    $restrict = true;
                 }
             }
@@ -262 +263 @@
      */
     public function getSelectedMimeTypes($role) {
-        return get_option('wpur_selected_mimes_' . $role, FALSE);
+        return get_option('wpur_selected_mimes_' . $role, false);
     }
     
@@ -279 +280 @@
             $upload_size = $this->getRoleMaxUploadSize($role, false, $upload_size_unit);
     
-            $check_all = $selected_mimes === FALSE;
+            $check_all = $selected_mimes === false;
 
             ob_start();
@@ -303 +304 @@
         }
 
-        return FALSE;
+        return false;
     }
 
@@ -342 +343 @@
      * @return int
      */
-    public function getRoleMaxUploadSize($role, $in_bytes = FALSE, $upload_size_unit = 'MB'){
+    public function getRoleMaxUploadSize($role, $in_bytes = false, $upload_size_unit = 'MB'){
         $upload_size_byte = get_option('wpur_max_upload_' . $role, 0);
 
@@ -350 +351 @@
             }
             else{
-                $upload_size = $upload_size_byte / ($upload_size_unit == 'MB' ? 1048576 : 1024);
+                $upload_size = $upload_size_byte / $this->getMultiplier($upload_size_unit);
                 return round($upload_size, 0);
             }
@@ -373 +374 @@
      * @param string $role
      * @param int $restrict_upload_size
-     * @param int $size_in_mb
+     * @param int $size
+     * @param string $size_unit
      */
     private function setRolesMaxUploadSize($role, $restrict_upload_size, $size, $size_unit){
         if($role){
-            $multiplier = $size_unit == 'MB' ? 1048576 : 1024;
-            $size_in_byte = ($size ? $size : 0) * $multiplier;
+            $size_in_byte = ($size ? $size : 0) * $this->getMultiplier($size_unit);
             update_option('wpur_max_upload_' . $role, $size_in_byte);
             update_option('wpur_max_upload_unit_' . $role, $size_unit);
@@ -511 +512 @@
 
     /**
+     * Returns multiplier for converting the limit to byte.
+     * 
+     * @param string $size_unit
+     * @return int
+     */
+    private function getMultiplier($size_unit){
+        switch($size_unit){ 
+            case 'MB':
+                return 1048576;
+            case 'KB': 
+                return 1024;
+            default:
+                return 1;
+        }
+    }
+
+    /**
      * For updating database on version upgrade
      */
@@ -530 +548 @@
     private function updateDB1002(){
         $roles = $this->getAllRoles();
-        $selected_mimes = get_option('wpur_selected_mimes', FALSE);
+        $selected_mimes = get_option('wpur_selected_mimes', false);
         $all_mimes = $this->getWPSupportedMimeTypes();
         
         foreach($roles as $role => $details){
-            if($role == 'administrator' || $selected_mimes === FALSE){       
+            if($role == 'administrator' || $selected_mimes === false){       
                 update_option('wpur_selected_mimes_' . $role, $all_mimes);
             }