Changeset 8756 for trunk

Timestamp:

Jan 18, 2011, 9:57:36 PM (13 years ago)

Author:

rvelices

Message:

• batch manager was not calling invalidate_user_cache
• batch manager can delete photos added by ftp
• call sync_users on admin page less often (too many sql queries)

Location:

trunk

Files:

• admin.php (modified) (3 diffs)
• admin/batch_manager_global.php (modified) (1 diff)

trunk/admin.php

@@ -70 +70 @@
 // |                    synchronize user informations                      |
 // +-----------------------------------------------------------------------+
-
-sync_users();
+if (mt_rand(0,9)==0)
+{
+  sync_users();
+}
 
 // +-----------------------------------------------------------------------+
@@ -198 +200 @@
         'cat_options',  // ?only POST; public/private; lock/unlock
         'cat_perm',     // ?only POST
-        'element_set',  // ?only POST; associate/dissociate
         'picture_modify', // ?only POST; associate/dissociate
         'user_list',    // ?only POST; group assoc
@@ -206 +207 @@
       )
     )
+    or ( isset($_POST) and in_array($page['page'],
+        array(
+          'batch_manager',  // associate/dissociate; delete; set level
+        )
+      )
+    )
   )
 {

trunk/admin/batch_manager_global.php

@@ -413 +413 @@
   $query = '
 SELECT
-    COUNT(*)
+    id
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $page['cat_elements_id']).')
-    AND storage_category_id IS NULL
-;';
-  list($counter) = pwg_db_fetch_row(pwg_query($query));
-
-  if ($counter > 0)
+    AND file NOT LIKE \'http%\'
+  LIMIT 1
+;';
+  ;
+
+  if ( pwg_db_fetch_row(pwg_query($query)) )
   {
     $template->assign('show_delete_form', true);