Changeset 1738572

Timestamp:

09/29/2017 06:21:18 PM (8 years ago)

Author:

alim511

Message:

Add ability to choose file extensions on Settings tab

Location:

amw-clear-upload-folder/trunk

Files:

• README.txt (modified) (3 diffs)
• amw-clear-upload-folder.php (modified) (2 diffs)
• assets/js/amw-admin.js (added)
• assets/js/amw-clear-upload-folder.js (deleted)
• assets/js/amw-settings.js (added)
• includes/AMVCUFClass.php (modified) (7 diffs)
• includes/AMVCUFSettingsClass.php (modified) (4 diffs)
• includes/admin.php (modified) (2 diffs)
• includes/includes.php (modified) (3 diffs)

amw-clear-upload-folder/trunk/README.txt

@@ -16 +16 @@
 <strong>
 Before using this plugin, please make sure that you BACKUP 'upload' folder. This is the most important step!
+Also do not forget Rescan Images every time you change settings
 </strong>
 
@@ -97 +98 @@
 == Changelog ==
 
+= 1.0.7 =
+* Add ability to choose file extensions on Settings tab.
+
 = 1.0.6 =
 * Regex improvement.
@@ -122 +126 @@
 == Upgrade Notice ==
 
+= 1.0.7 =
+Add ability to choose file extensions on Settings tab.
+
 = 1.0.6 =
 Regex improvement.

amw-clear-upload-folder/trunk/amw-clear-upload-folder.php

@@ -4 +4 @@
 Plugin URI: https://wordpress.org/plugins/amw-clear-upload-folder/
 Description: Removes unused files from the 'uploads' folder
-Version: 1.0.6
+Version: 1.0.7
 Author: Alimov Dmitriy
 Author URI: https://www.facebook.com/alimov.dmitriy.me
@@ -36 +36 @@
  * Define constants
  * */
-define('AWM_CUF_VERSION', '1.0.6');
+define('AWM_CUF_VERSION', '1.0.7');
 define('AWM_CUF_SITE_URL', $_SERVER['SERVER_NAME']);
 define('AWM_CUF_URL', plugin_dir_url(__FILE__));

amw-clear-upload-folder/trunk/includes/AMVCUFClass.php

@@ -7 +7 @@
     function __construct(){
         $this->checkDBTable();
+    }
+
+    /**
+     * Clear transient caches
+     **/
+    public function cleanTransient() {
+        delete_transient('db_files_names_array');
+        delete_transient('server_files_names_array');
+        delete_transient('server_dir_names_array');
     }
 
@@ -128 +137 @@
 
         if (false === $serverFilesArr) {
+            $cufSettings = new AMVCUFSettingsClass();
             $serverFilesArr = array();
+            $extArr = $cufSettings->getSettings('update_extensions');
+            $extArr = unserialize($extArr[0]['settings_value']);
+            $extStr = '{'.implode(',', $extArr).'}';
+
             foreach($foldersArr as $folder) {
                 if($folder['folderPath'] != '\\') {
                     $directory = $folder['fullFolderPath'];
-                    $images = glob("$directory*.{jpg,jpeg,png,bmp,pdf,webm,mp4,ogg}", GLOB_BRACE);
+                    $images = glob("$directory*.$extStr", GLOB_BRACE);
 
                     foreach($images as $key => $image) {
@@ -147 +161 @@
 
     /**
-     * Get files from DB
-     **/
-    public function getDBImages() {
-        global $wpdb;
-        $imgDBArr = get_transient('db_files_names_array');
-
-        if(false === $imgDBArr) {
-            $imgDBArr = array();
+     * Get all files from DB
+     **/
+    public function getAllDBFiles() {
+        $allDBArr = get_transient('all_db_files_names_array');
+
+        if(false === $allDBArr) {
+            global $wpdb;
+            $allDBArr = array();
             $postStr = '';
             $postMetaStr = '';
-            $extArr = array('jpg', 'jpeg', 'png', 'bmp', 'pdf', 'webm', 'mp4', 'ogg');
-            $ignoredFoldersArr = $this->getIgnoredFolders();
-
-            foreach($ignoredFoldersArr as $ignoredFolder) {
-                $postStr .= 'AND guid NOT LIKE "%'.$ignoredFolder['folder_name'].'%" ';
-                $postMetaStr .= 'AND meta_value NOT LIKE "%'.$ignoredFolder['folder_name'].'%" ';
-            }
 
             $sqlPost = $wpdb->get_results(
-                "SELECT guid FROM wp_posts WHERE post_type = 'attachment' AND guid LIKE '%".AWM_CUF_SITE_URL."%' ".$postStr, ARRAY_A
+                "SELECT guid FROM wp_posts WHERE post_type = 'attachment' AND guid LIKE '%".AWM_CUF_SITE_URL."%' ", ARRAY_A
             );
             $sqlPostMeta = $wpdb->get_results(
-                "SELECT meta_value FROM wp_postmeta WHERE meta_value LIKE '%".AWM_CUF_SITE_URL."%' ".$postMetaStr, ARRAY_A
+                "SELECT meta_value FROM wp_postmeta WHERE meta_value LIKE '%".AWM_CUF_SITE_URL."%' ", ARRAY_A
             );
 
             if(!empty($sqlPost)) {
                 foreach($sqlPost as $img) {
-                    $fileParts = pathinfo($img['guid']);
-
-                    if (in_array($fileParts['extension'], $extArr)){
-                        $imgUrl = explode('/wp-content/uploads', $img['guid']);
-                        array_push($imgDBArr, $imgUrl[1]);
-                    }
+                    $imgUrl = explode('/wp-content/uploads', $img['guid']);
+                    array_push($allDBArr, $imgUrl[1]);
                 }
             }
@@ -185 +188 @@
             if(!empty($sqlPostMeta)) {
                 foreach($sqlPostMeta as $img) {
-                    $filePartsMeta = pathinfo($img['meta_value']);
-
-                    if (in_array($filePartsMeta['extension'], $extArr)){
-                        $imgUrl = explode('/wp-content/uploads', $img['meta_value']);
-                        array_push($imgDBArr, $imgUrl[1]);
-                    }
-                }
-            }
-
-            set_transient('db_files_names_array', $imgDBArr, 12 * HOUR_IN_SECONDS);
-        }
-
-        return $imgDBArr;
+                    $imgUrl = explode('/wp-content/uploads', $img['meta_value']);
+                    array_push($allDBArr, $imgUrl[1]);
+                }
+            }
+
+            set_transient('all_db_files_names_array', $allDBArr, 12 * HOUR_IN_SECONDS);
+        }
+
+        return $allDBArr;
+    }
+
+    /**
+     * Get files from DB
+     **/
+    public function getDBImages() {
+        $noIgnoredFoldersFilesArr = get_transient('db_files_names_array');
+
+        if(false === $noIgnoredFoldersFilesArr) {
+            $filesDBArr = $this->getAllDBFiles();
+
+            if(!empty($filesDBArr)) {
+                $cufSettings = new AMVCUFSettingsClass();
+                $postStr = '';
+                $postMetaStr = '';
+                $noIgnoredFoldersFilesArr = array();
+                $extArr = $cufSettings->getSettings('update_extensions');
+                $extArr = unserialize($extArr[0]['settings_value']);
+                $ignoredFoldersArr = $this->getIgnoredFolders();
+
+                foreach($filesDBArr as $file) {
+                    $exist = false;
+                    foreach($ignoredFoldersArr as $ignoredFolder) {
+                        if(strpos($file, $ignoredFolder['folder_name']) !== false) {
+                            $exist = true;
+                        }
+                    }
+                    if(!$exist) {
+                        $fileParts = pathinfo($file);
+                        if (in_array($fileParts['extension'], $extArr)){
+                            array_push($noIgnoredFoldersFilesArr, $file);
+                        }
+                    }
+                }
+            }
+
+            set_transient('db_files_names_array', $noIgnoredFoldersFilesArr, 12 * HOUR_IN_SECONDS);
+        }
+
+        return $noIgnoredFoldersFilesArr;
     }
 
@@ -239 +278 @@
             );
             if($sql) {
-                delete_transient('db_files_names_array');
-                delete_transient('server_files_names_array');
-                delete_transient('server_dir_names_array');
+                $this->cleanTransient();
                 return true;
             }
@@ -259 +296 @@
                 );
                 if($sql) {
-                    delete_transient('db_files_names_array');
-                    delete_transient('server_files_names_array');
-                    delete_transient('server_dir_names_array');
+                    $this->cleanTransient();
                     return true;
                 }
@@ -315 +350 @@
      **/
     public function isThumbnailsExist($string, $arr) {
-        preg_match('/\/([a-zA-Z0-9_-—\D]*)\./', $string, $stringPart);
+        preg_match('/\/([a-zA-Z0-9_-—\D]*)\./', $string, $stringPart);
 //        preg_match('/\/([a-zA-Z0-9_-]*)\./', $string, $stringPart);
         preg_match('/(\d+)(x|X)(\d+)$/', $stringPart[1], $fileName);

amw-clear-upload-folder/trunk/includes/AMVCUFSettingsClass.php

@@ -6 +6 @@
 
     function __construct(){
-        $settings = $this->getSettings('update_thumbs');
-        if(empty($settings)) {
-            global $wpdb;
-            $wpdb->query(
-                "INSERT INTO `wp_amv_settings` (`settings_name`, `settings_value`) VALUES ('update_thumbs', 'false')"
-            );
+        $thumbs = $this->getSettings('update_thumbs');
+        $extensions = $this->getSettings('update_extensions');
+        $allExtensions = $this->getSettings('all_extensions');
+
+        if(empty($thumbs)) {
+            $this->updateSettings(array('action' => 'update_thumbs', 'value' => 'false'));
+        }
+
+        if(empty($allExtensions)) {
+            $extData = serialize($this->getExtensions('arr'));
+            $this->updateSettings(array('action' => 'all_extensions', 'value' => $extData));
+        }
+
+        if(empty($extensions)) {
+            if(empty($extData)) {
+                $extData = serialize($this->getExtensions('arr'));
+            }
+            $this->updateSettings(array('action' => 'update_extensions', 'value' => $extData));
         }
     }
@@ -31 +43 @@
     }
 
+    /**
+     * Update settings from the database
+     **/
     public function updateSettings($postArray) {
         global $wpdb;
@@ -39 +54 @@
 
         if(!empty($settingsArr[0])) {
+            if($name == 'update_extensions') {
+                $tempExtArr = unserialize($settingsArr[0]['settings_value']);
+
+                if(!in_array($value, $tempExtArr)) {
+                    array_push($tempExtArr, $value);
+                } else {
+                    if(($key = array_search($value, $tempExtArr)) !== false) {
+                        unset($tempExtArr[$key]);
+                    }
+                }
+
+                $value = serialize($tempExtArr);
+            }
+
             $sql = $wpdb->query(
                 "UPDATE `wp_amv_settings` SET settings_value = '$value' WHERE settings_name = '$name'"
@@ -51 +80 @@
         }
     }
+
+    /**
+     * Get files extensions from db
+     * $outputFormat: str or arr
+     **/
+    public function getExtensions($outputFormat) {
+        $cuf = new AMVCUFClass();
+        $allFilesArr = $cuf->getAllDBFiles();
+        $extArr = array();
+        $extStr = '';
+
+        foreach($allFilesArr as $file) {
+            $fileParts = pathinfo($file);
+            if (!in_array($fileParts['extension'], $extArr) && !empty($fileParts['extension'])){
+                if(!preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/', $fileParts['extension'])) {
+                    array_push($extArr, $fileParts['extension']);
+                    $extStr .= $fileParts['extension'] . ', ';
+                }
+            }
+        }
+
+        $this->updateSettings(array('action' => 'all_extensions', 'value' => serialize($extArr)));
+
+        if($outputFormat == 'arr') {
+            return $extArr;
+        } else if ($outputFormat == 'str') {
+            return $extStr;
+        }
+    }
 }

amw-clear-upload-folder/trunk/includes/admin.php

@@ -109 +109 @@
                                     $checkedThumbs = '';
                                     $valueThumbs = 'No';
-                                    $settingsArr = $cufSettings->getSettings('update_thumbs');
-                                    if(!empty($settingsArr[0])) {
-                                        if($settingsArr[0]['settings_value'] == 'true') {
+                                    $thumbsArr = $cufSettings->getSettings('update_thumbs');
+                                    if(!empty($thumbsArr[0])) {
+                                        if($thumbsArr[0]['settings_value'] == 'true') {
                                             $checkedThumbs = 'checked';
                                             $valueThumbs = 'Yes';
@@ -125 +125 @@
                             </td>
                         </tr>
+                        <tr>
+                            <td>File extensions to search</td>
+                            <td>
+                                <?php
+                                    $extensionsArr = $cufSettings->getSettings('all_extensions');
+                                    $extensionsArrVal = unserialize($extensionsArr[0]['settings_value']);
+
+                                    $serachedExtensionsArr = $cufSettings->getSettings('update_extensions');
+                                    $serachedExtensionsArrVal = unserialize($serachedExtensionsArr[0]['settings_value']);
+
+                                    foreach($extensionsArrVal as $ext) {
+                                        $checked = '';
+                                        if(in_array($ext, $serachedExtensionsArrVal)) {
+                                            $checked = 'checked';
+                                        } ?>
+                                        <label class="extensions-checkbox checkbox">
+                                            <input type="checkbox" value="<?php echo $ext; ?>" <?php echo $checked; ?>> <?php echo $ext; ?>
+                                        </label>
+                                    <?php } ?>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>

amw-clear-upload-folder/trunk/includes/includes.php

@@ -37 +37 @@
         wp_enqueue_script('bootstrapJS', AWM_CUF_URL.'assets/js/bootstrap.js', array('jquery'));
         wp_enqueue_script('sweetalertJS', AWM_CUF_URL.'assets/js/sweetalert.min.js', array('jquery'));
-        wp_enqueue_script('amwClearUploadFolderJS', AWM_CUF_URL.'assets/js/amw-clear-upload-folder.js', array('jquery', 'sweetalertJS'));
+        wp_enqueue_script('amwAdminJS', AWM_CUF_URL.'assets/js/amw-admin.js', array('jquery', 'sweetalertJS'));
+        wp_enqueue_script('amwSettingsJS', AWM_CUF_URL.'assets/js/amw-settings.js', array('jquery', 'sweetalertJS'));
 
         wp_enqueue_style('bootstrapCSS', AWM_CUF_URL.'assets/css/bootstrap.css');
@@ -62 +63 @@
 add_action('wp_ajax_update_thumbs'       , 'AMVCUFUpdateThumbs');
 add_action('wp_ajax_nopriv_update_thumbs', 'AMVCUFUpdateThumbs');
+
+add_action('wp_ajax_update_extensions'       , 'AMVCUFUpdateExtensions');
+add_action('wp_ajax_nopriv_update_extensions', 'AMVCUFUpdateExtensions');
 
 function AMVCUFAddIgnoredFolder() {
@@ -212 +216 @@
     }
 }
+
+function AMVCUFUpdateExtensions() {
+    $postArray = (filter_input_array(INPUT_POST, $_POST));
+
+    if(isset($postArray['action']) && $postArray['action'] == 'update_extensions') {
+        $cufSettings = new AMVCUFSettingsClass();
+        $result = $cufSettings->updateSettings($postArray);
+        if(!empty($result)) {
+            $output = json_encode(
+                array(
+                    'status' => 'success',
+                    'status_code' => 200,
+                    'result' => $result
+                )
+            );
+            die($output);
+        } else if(empty($result)) {
+            $output = json_encode(
+                array(
+                    'status' => 'success',
+                    'status_code' => 200,
+                    'result' => $result
+                )
+            );
+            die($output);
+        } else {
+            array(
+                'status' => 'fail',
+                'status_code' => 500
+            );
+            die($output);
+        }
+    }
+}