Changeset 11380 for extensions

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'

Location:

extensions/SmartAlbums

Files:

• admin.php (modified) (2 diffs)
• include/functions.inc.php (modified) (4 diffs)
• include/index.php (added)
• include/init_cat_modify.php (modified) (1 diff)
• index.php (added)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (2 diffs)
• template/admin.tpl (modified) (1 diff)
• template/index.php (added)

extensions/SmartAlbums/admin.php

@@ -12 +12 @@
         $conf['SmartAlbums'] = array(
     'update_on_upload' => $_POST['update_on_upload'], 
-    'update_on_login' => $_POST['update_on_login'], 
     );    
         
@@ -22 +21 @@
   'SMART_PATH' => SMART_PATH,
         'update_on_upload' => $conf['SmartAlbums']['update_on_upload'],
-        'update_on_login' => $conf['SmartAlbums']['update_on_login'],
 ));
         

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

extensions/SmartAlbums/include/init_cat_modify.php

@@ -79 +79 @@
         ),
       'date' => array(
-        'the' => l10n('Added the'),
-        'before' => l10n('Added before the'),
-        'after' => l10n('Added after the'),
+        'the' => l10n('Added on'),
+        'before' => l10n('Added before'),
+        'after' => l10n('Added after'),
+        'the_crea' => l10n('Created on'),
+        'before_crea' => l10n('Created before'),
+        'after_crea' => l10n('Created after'),
         ),
       'limit' => array('limit' => 'limit'), // second filter not used

extensions/SmartAlbums/language/en_UK/plugin.lang.php

@@ -11 +11 @@
 $lang['None of these tags'] = 'None of these tags';
 $lang['Only these tags'] = 'Only these tags';
-$lang['Added the'] = 'Added the';
-$lang['Added before the'] = 'Added before the';
-$lang['Added after the'] = 'Added after the';
+$lang['Added on'] = 'Added on';
+$lang['Added before'] = 'Added before';
+$lang['Added after'] = 'Added after';
+$lang['Created on'] = 'Created on';
+$lang['Created before'] = 'Created before';
+$lang['Created after'] = 'Created after';
 $lang['%d photo'] = '%d photo';
 $lang['%d photos'] = '%d photos';
@@ -24 +27 @@
 $lang['Regenerate photos list of all SmartAlbums'] = 'Regenerate photos list of all SmartAlbums';
 $lang['Update albums on file upload'] = 'Update albums on file upload';
-$lang['Update albums when an admin logins'] = 'Update albums when an admin logins';
 
 ?>

extensions/SmartAlbums/language/fr_FR/plugin.lang.php

@@ -11 +11 @@
 $lang['None of these tags'] = 'Aucun des tags';
 $lang['Only these tags'] = 'Seulement les tags';
-$lang['Added the'] = 'Ajouté le';
-$lang['Added before the'] = 'Ajouté avant le';
-$lang['Added after the'] = 'Ajouté après le';
+$lang['Added on'] = 'Ajouté le';
+$lang['Added before'] = 'Ajouté avant le';
+$lang['Added after'] = 'Ajouté après le';
+$lang['Created on'] = 'Créé le';
+$lang['Created before'] = 'Créé avant le';
+$lang['Created after'] = 'Créé après le';
 $lang['%d photo'] = '%d photo';
 $lang['%d photos'] = '%d photos';
@@ -24 +27 @@
 $lang['Regenerate photos list of all SmartAlbums'] = 'Régénérer les photos de tous les SmartAlbums';
 $lang['Update albums on file upload'] = 'Mettre à jour les albums après la mise en ligne d\'un fichier';
-$lang['Update albums when an admin logins'] = 'Mettre à jour les albums quand un admin se connecte';
 
 ?>

extensions/SmartAlbums/main.inc.php

@@ -17 +17 @@
 
 add_event_handler('invalidate_user_cache', 'smart_make_all_associations');
-add_event_handler('login_success', 'smart_make_all_associations');
 include_once(SMART_PATH.'include/functions.inc.php');
 

extensions/SmartAlbums/maintain.inc.php

@@ -26 +26 @@
     \''.serialize(array(
         'update_on_upload' => false,
-        'update_on_login' => false,
         )
       ).'\',
@@ -47 +46 @@
     \''.serialize(array(
         'update_on_upload' => false,
-        'update_on_login' => false,
         )
       ).'\',

extensions/SmartAlbums/template/admin.tpl

@@ -12 +12 @@
                                 <label><input type="radio" name="update_on_upload" value="false" {if $update_on_upload == 'false'}checked="checked"{/if}/> {'No'|@translate}</label>
                         </li>
-                        <li>
-                                <span class="property">{'Update albums when an admin logins'|@translate}</span>
-                                <label><input type="radio" name="update_on_login" value="true" {if $update_on_login == 'true'}checked="checked"{/if}/> {'Yes'|@translate}</label>
-                                <label><input type="radio" name="update_on_login" value="false" {if $update_on_login == 'false'}checked="checked"{/if}/> {'No'|@translate}</label>
-                        </li>   
                 </ul>
         </fieldset>