Changeset 10980

Timestamp:

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

Author:

mistic100

Message:

test version

Location:

extensions/SmartAlbums

Files:

• include/count_images.php (modified) (1 diff)
• include/functions.inc.php (modified) (4 diffs)
• init_cat_list.php (added)
• init_cat_modify.php (modified) (5 diffs)
• main.inc.php (modified) (2 diffs)
• template/cat_modify.tpl (modified) (5 diffs)
• template/refresh.png (added)
• template/style.css (modified) (1 diff)

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
  *

extensions/SmartAlbums/init_cat_modify.php

@@ -1 +1 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
+/**
+ * Add the SmartAlbums configuration tool to virtual cats' configuration page
+ */
+ 
 function smart_cat_modify()
 {
   global $template;
   include_once(SMART_PATH.'include/functions.inc.php');
+  
   $cat_id = $_GET['cat_id'];
+  list($cat_dir) = pwg_db_fetch_row(pwg_query("SELECT dir FROM ".CATEGORIES_TABLE." WHERE id = ".$cat_id.";"));
   
+  // category must be virtual
+  if ($cat_dir != NULL)
+  {
+    return;
+  }
+  
+  /* SAVE FILTERS */
   if (isset($_POST['submitFilters']))
   {
     // test if it was a Smart Album
     $result = pwg_query("SELECT DISTINCT category_id FROM ".CATEGORY_FILTERS_TABLE." WHERE category_id = ".$cat_id.";");
-    $_was_smart = pwg_db_num_rows($result);
+    $was_smart = pwg_db_num_rows($result);
     
     /* this album is no longer a SmartAlbum */
-    if ($_was_smart AND !isset($_POST['is_smart']))
+    if ($was_smart AND !isset($_POST['is_smart']))
     {
       pwg_query("DELETE FROM ".IMAGE_CATEGORY_TABLE." WHERE category_id = ".$cat_id." AND smart = true;");
@@ -29 +41 @@
     {
       pwg_query("DELETE FROM ".CATEGORY_FILTERS_TABLE." WHERE category_id = ".$cat_id.";");
-
+      
+      $limit_is_set = false;
       foreach ($_POST['filters'] as $filter)
       {
-        $error = false;
-        if ($filter['type'] == 'tags')
-        {
-          $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;
-            array_push($page['errors'], l10n('Date string is malformed'));
-          }
-        }
-        else if ($filter['type'] == 'limit')
-        {
-          if (!preg_match('#([0-9]{1,})#', $filter['value']))
-          {
-            $error = true;
-            array_push($page['errors'], l10n('Limit must be an integer'));
-          }
-          else if (isset($limit_is_set))
-          {
-            $error = true;
-            array_push($page['errors'], l10n('You can\'t use more than one limit'));
-          }
-          else
-          {
-            $limit_is_set = true;
-          }
-        }
-        
-        if ($error == false)
+        if (($filter = smart_check_filter($filter)) != false)
         {
           pwg_query("INSERT INTO ".CATEGORY_FILTERS_TABLE."
@@ -70 +52 @@
       }
       
-      $associated_images = SmartAlbums_make_associations($cat_id);
+      $associated_images = smart_make_associations($cat_id);
+      invalidate_user_cache(true);
       $template->assign('IMAGE_COUNT', l10n_dec('%d photo', '%d photos', count($associated_images)));
-      
-      set_random_representant(array($cat_id));
-      invalidate_user_cache(true);
     }
   }
       
-  /* select options */
+  /* select options, for html_options */
   $template->assign('options', array(
     'tags' => array(
@@ -91 +71 @@
       'after' => l10n('Added after the'),
       ),
-    'limit' => array('limit' => 'limit'),
+    'limit' => array('limit' => 'limit'), // second filter not used
   ));
   
@@ -98 +78 @@
   while ($filter = pwg_db_fetch_assoc($filters))
   {
+    // get tags name and id
+    if ($filter['type'] == 'tags')
+    {
+      $query = "
+        SELECT
+          id AS tag_id,
+          name AS tag_name
+        FROM ".TAGS_TABLE."
+        WHERE id IN(".$filter['value'].")
+      ";
+      $filter['value'] = get_fckb_taglist($query); 
+    }
+    
     $template->append('filters', array(
       'TYPE' => $filter['type'],

extensions/SmartAlbums/main.inc.php

@@ -3 +3 @@
 Plugin Name: SmartAlbums
 Version: auto
-Description: Easy create dynamic albums with tags, date and other criteria
-Plugin URI: http://piwigo.org/ext/extension_view.php?eid=
+Description: Easily create dynamic albums with tags, date and other criteria
+Plugin URI: http://piwigo.org/ext/extension_view.php?eid=544
 Author: Mistic
 Author URI: http://www.strangeplanet.fr
@@ -18 +18 @@
 if (script_basename() == 'admin')
 {
-  include_once(SMART_PATH.'init_cat_modify.php');
+  add_event_handler('loc_begin_cat_modify', 'smart_init_cat_modify'); 
+  function smart_init_cat_modify()
+  {
+    include_once(SMART_PATH.'init_cat_modify.php');
+    smart_cat_modify();
+  }
   
-  add_event_handler('loc_begin_cat_modify', 'smart_cat_modify');  
+  add_event_handler('loc_begin_cat_list', 'smart_init_cat_list');
+  function smart_init_cat_list()
+  {
+    include_once(SMART_PATH.'init_cat_list.php');
+    smart_cat_list();
+  }
 }
 

extensions/SmartAlbums/template/cat_modify.tpl

@@ -1 +1 @@
 {combine_css path=$SMART_PATH|@cat:"template/style.css"}
 {include file='include/datepicker.inc.tpl'}
-{combine_script id='jquery.fcbkcomplete' load='async' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
+{combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
 
-{footer_script require='jquery,jquery.fcbkcomplete'}
+{footer_script require='jquery.tokeninput'}
 var lang = new Array();
 lang['tags filter'] = "{'tags filter'|@translate}";
@@ -34 +34 @@
   $('input[name="is_smart"]').change(function() {
     $('#SmartAlbum_options').toggle();
-    $('input[name="count_images"]').toggle();
+    $('input[name="countImages"]').toggle();
   });
   
-  $('input[name="count_images"]').click(function() {
-    count_images($(this).closest('form'));
+  $('input[name="countImages"]').click(function() {
+    countImages($(this).closest('form'));
     return false;
   });
   
   function add_filter(type) {
+    // add line
     $('<li class="filter_'+ type +'" id="filter_'+ i +'"></li>').appendTo('#filterList');
     
-    $('#filter_'+ i).html(
-      '<a href="#" class="removeFilter" title="'+ lang['remove this filter'] +'"><span>[x]</span></a>'+
-      '<input type="hidden" name="filters['+ i +'][type]" value="'+ type +'"/>'+
-      ' '+ lang[type +' filter'] +
-      
-      ' <select name="filters['+ i +'][cond]">'+ options[type] +'</select>'+
-      ' <input type="text" name="filters['+ i +'][value]"/>'
-    );
+    //set content
+    content = '<a href="#" class="removeFilter" title="'+ lang['remove this filter'] +'"><span>[x]</span></a>'+
+    '<input type="hidden" name="filters['+ i +'][type]" value="'+ type +'"/>&nbsp;'+ lang[type +' filter'] +
+    '&nbsp;<select name="filters['+ i +'][cond]">'+ options[type] +'</select>';
     
-    // reinit handler
+    if (type == 'tags') {
+      content += '&nbsp;<select name="filters['+ i +'][value]" class="tagSelect"></select>';
+    } else {
+      content += '&nbsp;<input type="text" name="filters['+ i +'][value]"/>';
+    }
+    
+    $('#filter_'+ i).html(content);
+    
+    // reinit handlers
     init_jquery_handlers();
     i++;
@@ -69 +74 @@
     });
     
-    $('.filter_tags input[type="text"]').each(function() {
-      if ($(this).hasClass('fcbk_initialized') == false) {
-        $(this).fcbkcomplete({
-          json_url: "admin.php?fckb_tags=1",
-          cache: false,
-          filter_case: false,
-          filter_hide: true,
-          firstselected: true,
-          filter_selected: true,
-          maxitems: 100,
-          newel: false
-        });
-        $(this).addClass('fcbk_initialized');
-      }
+    jQuery.getJSON('admin.php?fckb_tags=1', function(data) {
+      jQuery(".tagSelect").tokenInput(
+        data,
+        {
+      {/literal}
+          hintText: '{'Type in a search term'|@translate}',
+          noResultsText: '{'No results'|@translate}',
+          searchingText: '{'Searching...'|@translate}',
+          animateDropdown: false,
+          preventDuplicates: true,
+          allowCreation: true
+      {literal}
+        }
+      );
     });
   }
   
-  function count_images(form) {
+  function countImages(form) {
 {/literal}
                 jQuery.post("{$COUNT_SCRIPT_URL}", 'cat_id={$CAT_ID}&'+form.serialize(),
@@ -122 +127 @@
         </select>
         
+      {if $filter.TYPE == 'tags'}
+        <select name="filters[{$i}][value]" class="tagSelect">
+        {foreach from=$filter.VALUE item=tag}
+          <option value="{$tag.id}" class="selected">{$tag.name}</option>
+        {/foreach}
+        </select>
+      {else}
         <input type="text" name="filters[{$i}][value]" value="{$filter.VALUE}"/>
+      {/if}
       </li>
                         {counter}
@@ -144 +157 @@
   <p class="actionButtons" id="applyFilterBlock">
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitFilters"/>
-    <input class="submit" type="submit" value="{'Count'|@translate}" name="count_images" {if !isset($filters)}style="display:none;"{/if}/>
+    <input class="submit" type="submit" value="{'Count'|@translate}" name="countImages" {if !isset($filters)}style="display:none;"{/if}/>
     <span class="count_images_display">{$IMAGE_COUNT}</span>
   </p>

extensions/SmartAlbums/template/style.css

@@ -2 +2 @@
   display:none;
 }
+.token-input-list {
+  display:inline-block;
+  vertical-align:bottom;
+}
+#batchManagerGlobal #filterList li.token-input-token {
+  margin-bottom:3px !important
+}
+#batchManagerGlobal #filterList li.token-input-input-token {
+  margin-bottom:0px !important; 
+}