Changeset 10980 for extensions/SmartAlbums/include

Timestamp:

May 21, 2011, 6:16:47 PM (14 years ago)

Author:

mistic100

Message:

test version

Location:

extensions/SmartAlbums/include

Files:

• count_images.php (modified) (1 diff)
• functions.inc.php (modified) (4 diffs)

extensions/SmartAlbums/include/count_images.php

@@ -1 +1 @@
 <?php
+/**
+ * Count images for AJAX info
+ */
+
 define('PHPWG_ROOT_PATH','./../../../');
 define('IN_ADMIN', true);
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 include_once(SMART_PATH.'include/functions.inc.php');
 
-$error = false;
+$filters = array();
+$limit_is_set = false;
 foreach ($_POST['filters'] as $filter)
 {
-  if ($filter['type'] == 'tags')
+  if (($filter = smart_check_filter($filter)) != false)
   {
-    $filter['value'] = str_replace(' ', null, $filter['value']);
-  }
-  else if ($filter['type'] == 'date')
-  {
-    if (!preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})#', $filter['value']))
-    {
-      $error = true;
-    }
-  }
-  else if ($filter['type'] == 'limit')
-  {
-    if (!preg_match('#([0-9]{1,})#', $filter['value']))
-    {
-      $error = true;
-    }
-    else if (isset($limit_is_set))
-    {
-      $error = true;
-    }
-    else
-    {
-      $limit_is_set = true;
-    }
+    array_push($filters, $filter);
   }
 }
 
-if ($error == false)
-{
-  $associated_images = SmartAlbums_get_pictures($_POST['cat_id'], $_POST['filters']);
-  echo l10n_dec('%d photo', '%d photos', count($associated_images));
-}
-else
-{
-  echo 'error';
-}
+$associated_images = smart_get_pictures($_POST['cat_id'], $filters);
+echo l10n_dec('%d photo', '%d photos', count($associated_images));
+
 ?>

extensions/SmartAlbums/include/functions.inc.php

@@ -7 +7 @@
  * @return array
  */
-function SmartAlbums_make_associations($cat_id)
+function smart_make_associations($cat_id)
 {
   pwg_query("DELETE FROM ".IMAGE_CATEGORY_TABLE." WHERE category_id = ".$cat_id." AND smart = true;");
   
-  $images = SmartAlbums_get_pictures($cat_id);
-  $dbfields = array('image_id', 'category_id', 'smart');
+  $images = smart_get_pictures($cat_id);
   
   if (count($images) != 0)
@@ -24 +23 @@
       );
     }
-    mass_inserts_ignore(IMAGE_CATEGORY_TABLE, $dbfields, $datas);
+    mass_inserts_ignore(
+      IMAGE_CATEGORY_TABLE, 
+      array_keys($datas[0]), 
+      $datas
+    );
+    set_random_representant(array($cat_id));
   }
   
@@ -37 +41 @@
  * @return array
  */
-function SmartAlbums_get_pictures($cat_id, $filters = null)
+function smart_get_pictures($cat_id, $filters = null)
 {
   global $conf;
@@ -165 +169 @@
 
 /**
+ * Check if the filter is proper
+ *
+ * @param array filter
+ * @return array or false
+ */
+function smart_check_filter($filter)
+{
+  global $limit_is_set, $page;
+  $error = false;
+  
+  # tags
+  if ($filter['type'] == 'tags')
+  {
+    if ($filter['value'] == null) // tags fields musn't be null
+    {
+      $error = true;
+      array_push($page['errors'], l10n('No tag selected'));
+    }
+    else
+    {
+      $filter['value'] = implode(',', get_fckb_tag_ids($filter['value']));
+    }
+  }
+  # date
+  else if ($filter['type'] == 'date')
+  {
+    if (!preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})#', $filter['value'])) // dates must be proper
+    {
+      $error = true;
+      array_push($page['errors'], l10n('Date string is malformed'));
+    }
+  }
+  # limit
+  else if ($filter['type'] == 'limit')
+  {
+    if (!preg_match('#([0-9]{1,})#', $filter['value'])) // limit must be an integer
+    {
+      $error = true;
+      array_push($page['errors'], l10n('Limit must be an integer'));
+    }
+    else if ($limit_is_set == true) // only one limit is allowed, first is saved
+    {
+      $error = true;
+      array_push($page['errors'], l10n('You can\'t use more than one limit'));
+    }
+    else
+    {
+      $limit_is_set = true;
+    }
+  }
+  
+  # out
+  if ($error == false)
+  {
+    return $filter;
+  }
+  else
+  {
+    return false;
+  }
+}
+
+
+/**
  * inserts multiple lines in a table, ignore duplicate entries
  *