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

Timestamp:

Jun 28, 2011, 3:19:44 PM (13 years ago)

Author:

mistic100

Message:

keep category representant if possible

File:

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

extensions/SmartAlbums/include/functions.inc.php

@@ -9 +9 @@
 function smart_make_associations($cat_id)
 {
-  pwg_query('DELETE FROM '.IMAGE_CATEGORY_TABLE.' WHERE category_id = '.$cat_id.' AND smart = true;');
+  $query = '
+DELETE FROM '.IMAGE_CATEGORY_TABLE.' 
+  WHERE 
+    category_id = '.$cat_id.' 
+    AND smart = true
+;';
+  pwg_query($query);
   
   $images = smart_get_pictures($cat_id);
@@ -30 +36 @@
   }
   
-  if (!function_exists('set_random_representant'))
-  {
-    include(PHPWG_ROOT_PATH.'admin/include/functions.php');
-  }
-  set_random_representant(array($cat_id));
+  // represantant, try to not overwrite if still in images list
+  $query = '
+SELECT representative_picture_id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id = '.$cat_id.'
+;';
+  list($rep_id) = pwg_db_fetch_row(pwg_query($query));
+  
+  if ( !in_array($rep_id, $images) )
+  {
+    if (!function_exists('set_random_representant'))
+    {
+      include(PHPWG_ROOT_PATH.'admin/include/functions.php');
+    }
+    set_random_representant(array($cat_id));
+  }
   
   return $images;
@@ -79 +96 @@
   if ($filters == null)
   {
+    $filters = array();
+    
     $query = '
 SELECT * 
@@ -85 +104 @@
   ORDER BY type ASC, cond ASC
 ;';
-    $filters = pwg_query($query);
-    
-    if (!pwg_db_num_rows($filters)) return array();
-    
-    while ($filter = pwg_db_fetch_assoc($filters))
-    {
-      $temp[] = array(
-        'type' => $filter['type'],
-        'cond' => $filter['cond'],
-        'value' => $filter['value'],
+    $result = pwg_query($query);
+    
+    if (!pwg_db_num_rows($result)) return $filters;
+    
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      $filters[] = array(
+        'type' => $row['type'],
+        'cond' => $row['cond'],
+        'value' => $row['value'],
         );
     }
-     
-    $filters = $temp;
   }
     
@@ -110 +127 @@
     if ($filter['type'] == 'tags')
     {
-        if($filter['cond'] == "all")
-        {
-          $tags_arr = explode(',', $filter['value']);
-          
-          foreach($tags_arr as $value)
-          {
-            $join[] = IMAGE_TAG_TABLE.' AS it_'.$i_tags.' ON i.id = it_'.$i_tags.'.image_id';
-            $where[] = 'it_'.$i_tags.'.tag_id = '.$value;
-            $i_tags++;
-          }
-        }
-        else if ($filter['cond'] == 'one') 
+      if($filter['cond'] == "all")
+      {
+        $tags_arr = explode(',', $filter['value']);
+        
+        foreach($tags_arr as $value)
         {
           $join[] = IMAGE_TAG_TABLE.' AS it_'.$i_tags.' ON i.id = it_'.$i_tags.'.image_id';
-          $where[] = 'it_'.$i_tags.'.tag_id IN ('.$filter['value'].')';
+          $where[] = 'it_'.$i_tags.'.tag_id = '.$value;
           $i_tags++;
         }
-        else if ($filter['cond'] == 'none') 
-        {
-          $sub_query = '
+      }
+      else if ($filter['cond'] == 'one') 
+      {
+        $join[] = IMAGE_TAG_TABLE.' AS it_'.$i_tags.' ON i.id = it_'.$i_tags.'.image_id';
+        $where[] = 'it_'.$i_tags.'.tag_id IN ('.$filter['value'].')';
+        $i_tags++;
+      }
+      else if ($filter['cond'] == 'none') 
+      {
+        $sub_query = '
       SELECT it_'.$i_tags.'.image_id
         FROM '.IMAGE_TAG_TABLE.' AS it_'.$i_tags.'
@@ -137 +154 @@
         GROUP BY it_'.$i_tags.'.image_id
     ';
-          $where[] = 'NOT EXISTS ('.$sub_query.')';
-          $i_tags++;
-        }
-        else if ($filter['cond'] == 'only') 
-        {
-          $sub_query = '
+        $where[] = 'NOT EXISTS ('.$sub_query.')';
+        $i_tags++;
+      }
+      else if ($filter['cond'] == 'only') 
+      {
+        $sub_query = '
       SELECT it_'.$i_tags.'.image_id
         FROM '.IMAGE_TAG_TABLE.' AS it_'.$i_tags.'
@@ -150 +167 @@
         GROUP BY it_'.$i_tags.'.image_id
     ';
-          $where[] = 'NOT EXISTS ('.$sub_query.')';
+        $where[] = 'NOT EXISTS ('.$sub_query.')';
+      
+        $i_tags++;
+        $tags_arr = explode(',', $filter['value']);
         
+        foreach($tags_arr as $value)
+        {
+          $join[] = IMAGE_TAG_TABLE.' AS it_'.$i_tags.' ON i.id = it_'.$i_tags.'.image_id';
+          $where[] = 'it_'.$i_tags.'.tag_id = '.$value;
           $i_tags++;
-          $tags_arr = explode(',', $filter['value']);
-          
-          foreach($tags_arr as $value)
-          {
-            $join[] = IMAGE_TAG_TABLE.' AS it_'.$i_tags.' ON i.id = it_'.$i_tags.'.image_id';
-            $where[] = 'it_'.$i_tags.'.tag_id = '.$value;
-            $i_tags++;
-          }
-        }        
+        }
+      }        
     }
     // date
@@ -234 +251 @@
 /**
  * Check if the filter is proper
- *
  * @param array filter
  * @return array or false
@@ -246 +262 @@
   if ($filter['type'] == 'tags')
   {
-    if ($filter['value'] == null) // tags fields musn't be null
+    if ($filter['value'] == null)
     {
       $error = true;
@@ -259 +275 @@
   else if ($filter['type'] == 'date')
   {
-    if (!preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})#', $filter['value'])) // dates must be proper
+    if (!preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})#', $filter['value']))
     {
       $error = true;
@@ -268 +284 @@
   else if ($filter['type'] == 'limit')
   {
-    if (!preg_match('#([0-9]{1,})#', $filter['value'])) // limit must be an integer
+    if (!preg_match('#([0-9]{1,})#', $filter['value']))
     {
       $error = true;
@@ -298 +314 @@
 /**
  * inserts multiple lines in a table, ignore duplicate entries
- *
  * @param string table_name
  * @param array dbfields