Changeset 16104 for extensions/SmartAlbums/include

Timestamp:

Jun 27, 2012, 9:19:07 PM (12 years ago)

Author:

mistic100

Message:

updated for Piwigo 2.4
new filters : name, author, level, hits

Location:

extensions/SmartAlbums/include

Files:

• cat_list.php (moved) (moved from extensions/SmartAlbums/include/init_cat_list.php) (3 diffs)
• count_images.php (modified) (3 diffs)
• functions.inc.php (modified) (11 diffs)
• index.php (modified) (1 diff)
• init_cat_modify.php (deleted)
• page_items.php (moved) (moved from extensions/SmartAlbums/include/init_page_items.php) (1 diff)

extensions/SmartAlbums/include/cat_list.php

@@ -42 +42 @@
       {
         $associated_images = smart_make_associations($category['id']);
-        array_push(
-          $page['infos'], 
-          sprintf(
-            l10n('%d photos associated to album %s'), 
+        array_push($page['infos'], 
+          sprintf(l10n('%d photos associated to album %s'), 
             count($associated_images), 
-            '«'.trigger_event(
-              'render_category_name',
-              $category['name'],
-              'admin_cat_list'
-              ).'»'
+            '«'.trigger_event('render_category_name', $category['name'], 'admin_cat_list').'»'
             )
           );
@@ -60 +54 @@
     {
       $associated_images = smart_make_associations($_GET['smart_generate']);    
-      array_push(
-        $page['infos'], 
-        sprintf(
-          l10n('%d photos associated to album %s'), 
+      array_push($page['infos'], 
+        sprintf(l10n('%d photos associated to album %s'), 
           count($associated_images), 
-          '«'.trigger_event(
-            'render_category_name',
-            $smart_cats[$_GET['smart_generate']]['name'],
-            'admin_cat_list'
-            ).'»'
+          '«'.trigger_event('render_category_name', $smart_cats[ $_GET['smart_generate'] ]['name'], 'admin_cat_list').'»'
           )
         );
@@ -99 +87 @@
   global $smart_count;
   
-  $search[0] = '{if isset($category.U_SYNC) }';
-  $replacement[0] = '
+  $search[0] = '{if isset($category.U_MANAGE_ELEMENTS) }';
+  $replacement[0] = $search[0].'
 {if isset($SMART_URL[$category.ID])}
-        <li><a href="{$SMART_URL[$category.ID]}" title="{\'Regenerate photos list of this SmartAlbum\'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/synchronize.png" class="button" alt="{\'Regenerate photos list of this SmartAlbum\'|@translate}"></a></li>
-{/if}'
-.$search[0];
+| <a href="{$SMART_URL[$category.ID]}">{\'Regenerate photos list of this SmartAlbum\'|@translate}</a>
+{/if}';
 
   if ($smart_count > 0)
   {
-    $search[1] = '</ul>
-</form>';
+    $search[1] = '<a href="#" id="autoOrderOpen">{\'apply automatic sort order\'|@translate}</a>';
     $replacement[1] = $search[1].'
-<form method="post" action="{$SMART_URL.all}">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-  <p><input class="submit" type="submit" value="{\'Regenerate photos list of all SmartAlbums\'|@translate}"></p>
-</form>';
+| <a href="{$SMART_URL.all}">{\'Regenerate photos list of all SmartAlbums\'|@translate}</a>';
   }
+  
+  $search[2] = '{$category.NAME}</a></strong>';
+  $replacement[2] = $search[2].'
+{if isset($SMART_URL[$category.ID])}
+<img src="'.SMART_PATH.'admin/template/lightning.png">
+{/if}';
 
   return str_replace($search, $replacement, $content);

extensions/SmartAlbums/include/count_images.php

@@ -6 +6 @@
 define('PHPWG_ROOT_PATH','./../../../');
 define('IN_ADMIN', true);
+
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+if (!is_admin()) die('Hacking attempt!');
+
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 include_once(SMART_PATH.'include/functions.inc.php');
+
+load_language('plugin.lang', SMART_PATH);
+$conf['SmartAlbums'] = unserialize($conf['SmartAlbums']);
 
 if (isset($_POST['filters']))
@@ -22 +29 @@
       array_push($filters, $filter);
     }
+    else
+    {
+      echo '<span class="filter_error">'.$page['errors'][ count($page['errors'])-1 ].'</span>';
+      exit;
+    }
   }
 
@@ -31 +43 @@
 }
 
-echo l10n_dec('%d photo', '%d photos', count($associated_images));
+echo '<span class="count_image">'.l10n_dec('%d photo', '%d photos', count($associated_images)).'</span>';
 
 ?>

extensions/SmartAlbums/include/functions.inc.php

@@ -36 +36 @@
   }
   
-  // represantant, try to not overwrite if still in images list
+  // representant, try to not overwrite if still in images list
   $query = '
 SELECT representative_picture_id
@@ -46 +46 @@
   if ( !in_array($rep_id, $images) )
   {
-    if (!function_exists('set_random_representant'))
-    {
-      include(PHPWG_ROOT_PATH.'admin/include/functions.php');
-    }
+    include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     set_random_representant(array($cat_id));
   }
@@ -64 +61 @@
 {
   global $conf;
-    
-  if (!is_array($conf['SmartAlbums'])) $conf['SmartAlbums'] = unserialize($conf['SmartAlbums']);
   
   if ( defined('SMART_NOT_UPDATE') OR !$conf['SmartAlbums']['update_on_upload'] ) return;
@@ -94 +89 @@
 
   /* get filters */
-  if ($filters == null)
-  {
-    $filters = array();
-    
+  if ($filters === null)
+  {
     $query = '
 SELECT * 
@@ -106 +99 @@
     $result = pwg_query($query);
     
-    if (!pwg_db_num_rows($result)) return $filters;
+    if (!pwg_db_num_rows($result)) return array();
     
+    $filters = array();
     while ($row = pwg_db_fetch_assoc($result))
     {
@@ -117 +111 @@
     }
   }
+  else if (!count($filters))
+  {
+    return array();
+  }
     
   /* build constrains */
   ## generate 'join', 'where' arrays and 'limit' string to create the SQL query
-  ## inspired by PicsEngine by Michael Villar
+  ## inspired by PicsEngine 3 by Michael Villar
   $i_tags = 1;
   foreach ($filters as $filter)
   {
-    // tags
-    if ($filter['type'] == 'tags')
-    {
-      if($filter['cond'] == "all")
-      {
-        $tags_arr = explode(',', $filter['value']);
+    switch ($filter['type'])
+    {
+      // tags
+      case 'tags':
+      {
+        switch ($filter['cond'])
+        {
+          // search images which have all tags
+          case '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++;
+            }
+            
+            break;
+          }
+          // search images which tags are in the list
+          case '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++;
+            
+            break;
+          }
+          // exclude images which tags are in the list
+          case 'none':
+          {
+            $sub_query = '
+      SELECT it'.$i_tags.'.image_id
+        FROM '.IMAGE_TAG_TABLE.' AS it'.$i_tags.'
+        WHERE 
+          it'.$i_tags.'.image_id = i.id AND
+          it'.$i_tags.'.tag_id IN ('.$filter['value'].')
+        GROUP BY it'.$i_tags.'.image_id
+      ';
+            $join[] = IMAGE_TAG_TABLE.' AS it'.$i_tags.' ON i.id = it'.$i_tags.'.image_id';
+            $where[] = 'NOT EXISTS ('.$sub_query.')';
+            $i_tags++;
+            
+            break;
+          }
+          // exclude images which tags are not in the list and search images which have all tags
+          case 'only':
+          {
+            $sub_query = '
+      SELECT it'.$i_tags.'.image_id
+        FROM '.IMAGE_TAG_TABLE.' AS it'.$i_tags.'
+        WHERE 
+          it'.$i_tags.'.image_id = i.id AND
+          it'.$i_tags.'.tag_id NOT IN ('.$filter['value'].')
+        GROUP BY it'.$i_tags.'.image_id
+      ';
+            $join[] = IMAGE_TAG_TABLE.' AS it'.$i_tags.' ON i.id = it'.$i_tags.'.image_id';
+            $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++;
+            }
+            
+            break;
+          }
+        }
         
-        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') 
-      {
-        $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.'
-        WHERE 
-          it_'.$i_tags.'.image_id = i.id AND
-          it_'.$i_tags.'.tag_id IN ('.$filter['value'].')
-        GROUP BY it_'.$i_tags.'.image_id
-    ';
-        $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.'
-        WHERE 
-          it_'.$i_tags.'.image_id = i.id AND
-          it_'.$i_tags.'.tag_id NOT IN ('.$filter['value'].')
-        GROUP BY it_'.$i_tags.'.image_id
-    ';
-        $where[] = 'NOT EXISTS ('.$sub_query.')';
+        break;
+      }
+    
+      // date
+      case 'date':
+      {
+        switch ($filter['cond'])
+        {
+          case 'the_post':
+            $where[] = 'date_available BETWEEN "'.$filter['value'].' 00:00:00" AND "'.$filter['value'].' 23:59:59"';
+            break;
+          case 'before_post':
+            $where[] = 'date_available < "'.$filter['value'].' 00:00:00"';
+            break;
+          case 'after_post':
+            $where[] = 'date_available > "'.$filter['value'].' 23:59:59"';
+            break;
+          case 'the_taken':
+            $where[] = 'date_creation BETWEEN "'.$filter['value'].' 00:00:00" AND "'.$filter['value'].' 23:59:59"';
+            break;
+          case 'before_taken':
+            $where[] = 'date_creation < "'.$filter['value'].' 00:00:00"';
+            break;
+          case 'after_taken':
+            $where[] = 'date_creation > "'.$filter['value'].' 23:59:59"';
+            break;
+        }
+        
+        break;
+      }
       
-        $i_tags++;
-        $tags_arr = explode(',', $filter['value']);
+      // name
+      case 'name':
+      {
+        switch ($filter['cond'])
+        {
+          case 'contain':
+            $where[] = 'name LIKE "%'.$filter['value'].'%"';
+            break;
+          case 'begin':
+            $where[] = 'name LIKE "'.$filter['value'].'%"';
+            break;
+          case 'end':
+            $where[] = 'name LIKE "%'.$filter['value'].'"';
+            break;
+          case 'not_contain':
+            $where[] = 'name NOT LIKE "%'.$filter['value'].'%"';
+            break;
+          case 'not_begin':
+            $where[] = 'name NOT LIKE "'.$filter['value'].'%"';
+            break;
+          case 'not_end':
+            $where[] = 'name NOT LIKE "%'.$filter['value'].'"';
+            break;
+        }
         
-        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
-    else if ($filter['type'] == 'date')
-    {
-      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
-    else if ($filter['type'] == 'limit')
-    {
-      $limit = '0, '.$filter['value'];
+        break;
+      }
+      
+      // author
+      case 'author':
+      {
+        switch ($filter['cond'])
+        {
+          case 'is':
+            if ($filter['value'] != 'NULL') $filter['value'] = '"'.$filter['value'].'"';
+            $where[] = 'author = '.$filter['value'].'';
+            break;
+          case 'not_is':
+            if ($filter['value'] != 'NULL') $filter['value'] = '"'.$filter['value'].'"';
+            $where[] = 'author != '.$filter['value'].'';
+            break;
+          case 'in':
+            $filter['value'] = '"'.str_replace(',', '","', $filter['value']).'"';
+            $where[] = 'author IN('.$filter['value'].')';
+            break;
+          case 'not_in':
+            $filter['value'] = '"'.str_replace(',', '","', $filter['value']).'"';
+            $where[] = 'author NOT IN('.$filter['value'].')';
+            break;
+        }
+        
+        break;
+      }
+      
+      // hit
+      case 'hit':
+      {
+        switch ($filter['cond'])
+        {
+          case 'less':
+            $where[] = 'hit < '.$filter['value'].'';
+            break;
+          case 'more':
+            $where[] = 'hit >= '.$filter['value'].'';
+            break;
+        }
+        
+        break;
+      }
+      
+      // level
+      case 'level':
+      {
+        $where[] = 'level = '.$filter['value'].'';
+        break;
+      }
+      
+      // limit
+      case 'limit':
+      {
+        $limit = '0, '.$filter['value'];
+        break;
+      }
     }
   }
@@ -219 +319 @@
     if (isset($join))
     {
-      foreach ($join as $query)
-      {
-        $MainQuery .= '
-    LEFT JOIN '.$query;
-      }
+      $MainQuery.= '
+    LEFT JOIN '.implode("\n    LEFT JOIN ", $join);
     }
     if (isset($where))
     {
-      $MainQuery .= '
-  WHERE';
-      $i = 0;
-      foreach ($where as $query)
-      {
-        if ($i != 0) $MainQuery .= ' AND';
-        $MainQuery .= '
-    '.$query;
-        $i++;
-      }
-    }
-
-    $MainQuery .= '
+      $MainQuery.= '
+  WHERE
+    '.implode("\n    AND ", $where);
+    }
+
+  $MainQuery.= '
   GROUP BY i.id
- '.$conf['order_by'].'
+  '.$conf['order_by'].'
   '.(isset($limit) ? "LIMIT ".$limit : null).'
 ;';
 
+  // file_put_contents(SMART_PATH.'query.sql', $MainQuery);
   return array_from_query($MainQuery, 'id');
 }
@@ -256 +347 @@
 function smart_check_filter($filter)
 {
-  global $limit_is_set, $page;
+  global $page, $limit_is_set, $level_is_set;
   $error = false;
+  
+  if (!isset($limit_is_set)) $limit_is_set = false;
+  if (!isset($level_is_set)) $level_is_set = false;
   
   # tags
@@ -281 +375 @@
     }
   }
+  # name
+  else if ($filter['type'] == 'name')
+  {
+    if (empty($filter['value']))
+    {
+      $error = true;
+      array_push($page['errors'], l10n('Name is empty'));
+    }
+  }
+  # author
+  else if ($filter['type'] == 'author')
+  {
+    if (empty($filter['value']))
+    {
+      $error = true;
+      array_push($page['errors'], l10n('Author is empty'));
+    }
+    else
+    {
+      $filter['value'] = preg_replace('#([ ]?),([ ]?)#', ',', $filter['value']);
+    }
+  }
+  # hit
+  else if ($filter['type'] == 'hit')
+  {
+    if (!preg_match('#([0-9]{1,})#', $filter['value']))
+    {
+      $error = true;
+      array_push($page['errors'], l10n('Hits must be an integer'));
+    }
+  }
+  # level
+  else if ($filter['type'] == 'level')
+  {
+    if ($level_is_set == true) // only one level is allowed, first is saved
+    {
+      $error = true;
+      array_push($page['errors'], l10n('You can\'t use more than one level filter'));
+    }
+    else
+    {
+      $level_is_set = true;
+    }
+  }
   # limit
   else if ($filter['type'] == 'limit')
@@ -292 +430 @@
     {
       $error = true;
-      array_push($page['errors'], l10n('You can\'t use more than one limit'));
+      array_push($page['errors'], l10n('You can\'t use more than one limit filter'));
     }
     else
@@ -374 +512 @@
   }
 }
+
 ?>

extensions/SmartAlbums/include/index.php

@@ -1 +1 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );

extensions/SmartAlbums/include/page_items.php

@@ -3 +3 @@
 
 /**
- * Remove form $page['items'] picture that musn't be displayed
+ * Remove picture that musn't be displayed from $page['items']
  *
  * here we get all pictures that current user could see