Changeset 11380 for extensions/SmartAlbums/include/functions.inc.php

Timestamp:

Jun 15, 2011, 4:19:31 PM (13 years ago)

Author:

mistic100

Message:

add filters on date_creation fields, remove 'make associations on login'

File:

• extensions/SmartAlbums/include/functions.inc.php (modified) (4 diffs)

extensions/SmartAlbums/include/functions.inc.php

@@ -42 +42 @@
 /*
  * Make associations for all SmartAlbums
- * Called with invalidate_user_cache and/or on admin login
- * @param string login (not mandatory)
- */
-function smart_make_all_associations($login = false)
+ * Called with invalidate_user_cache
+ */
+function smart_make_all_associations()
 {
   global $conf;
@@ -51 +50 @@
   if (!is_array($conf['SmartAlbums'])) $conf['SmartAlbums'] = unserialize($conf['SmartAlbums']);
   
-  if ( !$login AND !defined('SMART_NOT_UPDATE') AND $conf['SmartAlbums']['update_on_upload'] != 'false' )
-    continue;
-  else if ( is_string($login) AND is_admin() AND $conf['SmartAlbums']['update_on_login'] != 'false' )
-    continue;
-  else
-    return;
+  if ( defined('SMART_NOT_UPDATE') OR $conf['SmartAlbums']['update_on_upload'] == 'false' ) return;
   
   /* get categories with smart filters */
@@ -69 +63 @@
   $smart_cats = array_from_query($query, 'id');
   array_map('smart_make_associations', $smart_cats);
-  
-  if (is_string($login))
-  {
-    define('SMART_NOT_UPDATE', 1);
-    invalidate_user_cache();
-  }
 }
 
@@ -178 +166 @@
     else if ($filter['type'] == 'date')
     {
-      if      ($filter['cond'] == 'the')    $where[] = 'date_available BETWEEN "'.$filter['value'].' 00:00:00" AND "'.$filter['value'].' 23:59:59"';
-      else if ($filter['cond'] == 'before') $where[] = 'date_available < "'.$filter['value'].' 00:00:00"';
-      else if ($filter['cond'] == 'after')  $where[] = 'date_available > "'.$filter['value'].' 23:59:59"';
+      switch ($filter['cond'])
+      {
+        case 'the':
+          $where[] = 'date_available BETWEEN "'.$filter['value'].' 00:00:00" AND "'.$filter['value'].' 23:59:59"';
+          break;
+        case 'before':
+          $where[] = 'date_available < "'.$filter['value'].' 00:00:00"';
+          break;
+        case 'after':
+          $where[] = 'date_available > "'.$filter['value'].' 23:59:59"';
+          break;
+        case 'the_crea':
+          $where[] = 'date_creation BETWEEN "'.$filter['value'].' 00:00:00" AND "'.$filter['value'].' 23:59:59"';
+          break;
+        case 'before_crea':
+          $where[] = 'date_creation < "'.$filter['value'].' 00:00:00"';
+          break;
+        case 'after_crea':
+          $where[] = 'date_creation > "'.$filter['value'].' 23:59:59"';
+          break;
+      }
     }
     // limit