From 0dd12caa6f4c0452167b0e621a01bee28e71b0af Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 15 Feb 2013 19:12:08 -0500
Subject: Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a - point out
 that there's duplicated code in gallery_event.

---
 modules/gallery/helpers/gallery_task.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/gallery/helpers/gallery_task.php')

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 856d2639..37de2f93 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -281,6 +281,7 @@ class gallery_task_Core {
       switch ($task->get("mode", "init")) {
       case "init":
         $threshold = time() - 1209600; // older than 2 weeks
+        // Note that this code is roughly duplicated in gallery_event::gallery_shutdown
         foreach(array("logs", "tmp") as $dir) {
           $dir = VARPATH . $dir;
           if ($dh = opendir($dir)) {
-- 
cgit v1.2.3


From 96ad7789c84b5b81320f9cb94b4c8cb4e10ad92f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 15 Feb 2013 16:15:40 -0800
Subject: Follow-on to 7bdccade98e76df3a7830bc45bc42321a77c709a to exclude
 directories for now.

---
 modules/gallery/helpers/gallery_event.php | 5 +++++
 modules/gallery/helpers/gallery_task.php  | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'modules/gallery/helpers/gallery_task.php')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index eb54e521..26432ef5 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -54,6 +54,11 @@ class gallery_event_Core {
               continue;
             }
 
+            // Ignore directories for now, but we should really address them in the long term.
+            if (is_dir("$dir/$file")) {
+              continue;
+            }
+
             if (filemtime("$dir/$file") <= $threshold) {
               unlink("$dir/$file");
               break;
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 37de2f93..a79cb2d5 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -290,6 +290,11 @@ class gallery_task_Core {
                 continue;
               }
 
+              // Ignore directories for now, but we should really address them in the long term.
+              if (is_dir("$dir/$file")) {
+                continue;
+              }
+
               if (filemtime("$dir/$file") <= $threshold) {
                 $files[] = "$dir/$file";
               }
-- 
cgit v1.2.3