minor ui fixes

add cleanup temp dir function
latenitesite · Mar 24, 2021 · 0381b74 · 0381b74
1 parent add39db
commit 0381b74
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/assets/images/source/blockpreview.sketch b/assets/images/source/blockpreview.sketch
diff --git a/assets/styles/admin/editor_form.scss b/assets/styles/admin/editor_form.scss
@@ -98,6 +98,10 @@
             }
           }
         }
+        &.formality__field--upload .formality__input .formality__upload {
+          padding-left: 0;
+          padding-right: 0;
+        }
       }
     }
     &.conversational {

diff --git a/assets/styles/public/components/_fields.scss b/assets/styles/public/components/_fields.scss
@@ -939,9 +939,6 @@
     }
   }
   &--upload {
-    > .formality__label {
-      //
-    }
     .formality__input {
       cursor: pointer;
       min-height: 7.5rem;

diff --git a/assets/styles/public/modifiers/_line.scss b/assets/styles/public/modifiers/_line.scss
@@ -77,7 +77,10 @@
           &--upload {
             .formality__input {
               .formality__upload {
-                padding: 0.7em 0;
+                padding: 0.7em 0 1em;
+                .formality__upload__toggle p {
+                  margin-bottom: 1rem
+                }
               }
             }
           }

diff --git a/public/class-formality-upload.php b/public/class-formality-upload.php
@@ -73,10 +73,33 @@ public function create_upload_dir() {
    */
   public function delete_temp_file($filename) {
     $directory = $this->get_upload_dir(true, 'path');
-    $filepath = $directory . '/' . $this->decode_filename('decrypt', $filename);
+    $filepath = trailingslashit($directory) . $this->decode_filename('decrypt', $filename);
     wp_delete_file_from_directory($filepath, $directory);
   }
 
+  /**
+   * Cleanup temp directory
+   *
+   * @since    1.3.0
+   */
+  public function cleanup_temp_dir($expire=3600, $limit=99) {
+    $directory = trailingslashit($this->get_upload_dir(true, 'path'));
+    if(!is_dir($directory) || !is_readable($directory) || !wp_is_writable($directory)) { return; }
+    $count = 0;
+
+    if($handle = opendir($directory)) {
+      while(false !== ($file = readdir($handle))) {
+        $filepath = path_join($directory, $file);
+        $mtime = @filemtime($filepath);
+        if($mtime && time() < $mtime + $expire) { continue; }
+        wp_delete_file($filepath);
+        $count++;
+        if($limit <= $count) { break; }
+      }
+      closedir($handle);
+    }
+  }
+
   /**
    * Encode/decode filename
    *
@@ -130,6 +153,7 @@ public function upload_temp_file() {
     if (wp_verify_nonce( $nonce, 'formality_async' ) && !empty($_FILES)) {
 
       $this->create_upload_dir();
+      $this->cleanup_temp_dir();
       if($old) { $this->delete_temp_file($old); }
 
       //get form and field informations