Changeset 26442 for extensions/SmartAlbums/admin/album.php

Timestamp:

Jan 4, 2014, 4:13:08 PM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6

File:

• extensions/SmartAlbums/admin/album.php (modified) (14 diffs)

extensions/SmartAlbums/admin/album.php

@@ -1 +1 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2012 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-if(!defined("PHPWG_ROOT_PATH")) die ("Hacking attempt!");
+defined('SMART_PATH') or die('Hacking attempt!');
 
 // +-----------------------------------------------------------------------+
@@ -33 +11 @@
 
 check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
-
-$admin_album_base_url = get_root_url().'admin.php?page=album-'.$_GET['cat_id'];
-$self_url = SMART_ADMIN.'-album&amp;cat_id='.$_GET['cat_id'];
+$cat_id = $_GET['cat_id'];
+
+$admin_album_base_url = get_root_url().'admin.php?page=album-'.$cat_id;
+$self_url = SMART_ADMIN.'-album&amp;cat_id='.$cat_id;
 
 $query = '
 SELECT *
   FROM '.CATEGORIES_TABLE.'
-  WHERE id = '.$_GET['cat_id'].'
+  WHERE id = '.$cat_id.'
 ;';
 $category = pwg_db_fetch_assoc(pwg_query($query));
@@ -48 +27 @@
   die("unknown album");
 }
+
+// category must be virtual
+if ($category['dir'] != NULL)
+{
+  die("physical album");
+}
+
 
 // +-----------------------------------------------------------------------+
@@ -60 +46 @@
 
 
-$cat_id = $_GET['cat_id'];
-
-// category must be virtual
-if ($category['dir'] != NULL)
-{
-  die("physical album");
-}
-
 // +-----------------------------------------------------------------------+
 // | Save Filters                                                          |
@@ -78 +56 @@
     var_dump($_POST['filters']);
   }
-  
+
   // test if it was a Smart Album
   $query = '
-SELECT DISTINCT category_id 
-  FROM '.CATEGORY_FILTERS_TABLE.' 
+SELECT DISTINCT category_id
+  FROM '.CATEGORY_FILTERS_TABLE.'
   WHERE category_id = '.$cat_id.'
 ;';
   $was_smart = pwg_db_num_rows(pwg_query($query));
-  
+
   /* 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;');
     pwg_query('DELETE FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
+
     set_random_representant(array($cat_id));
+
+    define('SMART_NOT_UPDATE', 1);
     invalidate_user_cache();
   }
   /* no filter selected */
-  else if ( isset($_POST['is_smart']) AND empty($_POST['filters']) )
-  {
-    array_push($page['errors'], l10n('No filter selected'));
+  else if (isset($_POST['is_smart']) and empty($_POST['filters']))
+  {
+    $page['errors'][] = l10n('No filter selected');
   }
   /* everything is fine */
-  else if ( isset($_POST['is_smart']) )
+  else if (isset($_POST['is_smart']))
   {
     pwg_query('DELETE FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
-    
+
     $inserts = array();
     foreach ($_POST['filters'] as $filter)
@@ -114 +95 @@
       }
     }
-    
+
     mass_inserts(
-      CATEGORY_FILTERS_TABLE, 
-      array('category_id', 'type', 'cond', 'value'), 
+      CATEGORY_FILTERS_TABLE,
+      array('category_id', 'type', 'cond', 'value'),
       $inserts,
       array('ignore'=>true)
       );
-    
+
     $associated_images = smart_make_associations($cat_id);
     $template->assign('IMAGE_COUNT', l10n_dec('%d photo', '%d photos', count($associated_images)));
-    
-    array_push($page['infos'], sprintf(l10n('%d photos associated to album %s'), count($associated_images), ''));
-    
+
+    $page['infos'][] = l10n('%d photos associated to album %s', count($associated_images), '');
+
     define('SMART_NOT_UPDATE', 1);
     invalidate_user_cache();
@@ -225 +206 @@
 /* get filters for this album */
 $query = '
-SELECT * 
-  FROM '.CATEGORY_FILTERS_TABLE.' 
+SELECT *
+  FROM '.CATEGORY_FILTERS_TABLE.'
   WHERE category_id = '.$cat_id.'
-  ORDER BY 
-    type ASC, 
+  ORDER BY
+    type ASC,
     cond ASC
 ;';
@@ -250 +231 @@
   WHERE id IN('.$filter['value'].')
 ;';
-    $filter['value'] = get_taglist($query); 
-  }
-  
+    $filter['value'] = get_taglist($query);
+  }
+
   $template->append('filters', $filter);
 }
@@ -260 +241 @@
 $template->assign('format_options', array(
   'portrait' => l10n('Portrait'),
-  'square'   => l10n('Square'),
+  'square'   => l10n('square'),
   'lanscape' => l10n('Landscape'),
   'panorama' => l10n('Panorama'),
@@ -274 +255 @@
 /* all albums */
 $query = '
-SELECT 
-    id, 
-    name, 
-    uppercats, 
+SELECT
+    id,
+    name,
+    uppercats,
     global_rank
   FROM '.CATEGORIES_TABLE.'
@@ -303 +284 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  $widths[] = $row['width'];
-  $heights[] = $row['height'];
-  $ratios[] = floor($row['width'] * 100 / $row['height']) / 100;
+  if ($row['width']>0 && $row['height']>0)
+  {
+    $widths[] = $row['width'];
+    $heights[] = $row['height'];
+    $ratios[] = floor($row['width'] / $row['height'] * 100) / 100;
+  }
 }
 
@@ -354 +338 @@
 }
 
-foreach (array_keys($ratio_categories) as $ratio_category)
-{
-  if (count($ratio_categories[$ratio_category]) > 0)
-  {
-    $dimensions['ratio_'.$ratio_category] = array(
-      'min' => $ratio_categories[$ratio_category][0],
-      'max' => $ratio_categories[$ratio_category][count($ratio_categories[$ratio_category]) - 1]
+foreach ($ratio_categories as $ratio_name => $ratio_values)
+{
+  if (count($ratio_values) > 0)
+  {
+    $dimensions['ratio_'.$ratio_name] = array(
+      'min' => $ratio_values[0],
+      'max' => array_pop($ratio_values),
       );
   }
@@ -371 +355 @@
 {
   $query = '
-SELECT count(1) 
-  FROM '.IMAGE_CATEGORY_TABLE.' 
-  WHERE 
-    category_id = '.$cat_id.' 
+SELECT count(1)
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE
+    category_id = '.$cat_id.'
     AND smart = true
 ';
@@ -396 +380 @@
 ));
 
-$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/album.tpl');
-
-?>
+$template->set_filename('SmartAlbums_content', realpath(SMART_PATH . 'admin/template/album.tpl'));