Changeset 11333 for extensions/SmartAlbums/init_cat_modify.php

Timestamp:

Jun 12, 2011, 5:56:09 PM (13 years ago)

Author:

mistic100

Message:

clean code, use TokenInput

File:

• extensions/SmartAlbums/init_cat_modify.php (modified) (9 diffs)

extensions/SmartAlbums/init_cat_modify.php

@@ -11 +11 @@
   
   $cat_id = $_GET['cat_id'];
-  list($cat_dir) = pwg_db_fetch_row(pwg_query("SELECT dir FROM ".CATEGORIES_TABLE." WHERE id = ".$cat_id.";"));
+  list($cat_dir) = pwg_db_fetch_row(pwg_query('SELECT dir FROM '.CATEGORIES_TABLE.' WHERE id = '.$cat_id.';'));
   
   // category must be virtual
@@ -23 +23 @@
   {
     // test if it was a Smart Album
-    $result = pwg_query("SELECT DISTINCT category_id FROM ".CATEGORY_FILTERS_TABLE." WHERE category_id = ".$cat_id.";");
+    $result = pwg_query('SELECT DISTINCT category_id FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
     $was_smart = pwg_db_num_rows($result);
     
@@ -29 +29 @@
     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.";");
+      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.';');
     }
     /* no filter selected */
@@ -40 +40 @@
     else if (isset($_POST['is_smart']) AND count($_POST['filters']) > 0)
     {
-      pwg_query("DELETE FROM ".CATEGORY_FILTERS_TABLE." WHERE category_id = ".$cat_id.";");
+      pwg_query('DELETE FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
       
       $limit_is_set = false;
@@ -47 +47 @@
         if (($filter = smart_check_filter($filter)) != false)
         {
-          pwg_query("INSERT INTO ".CATEGORY_FILTERS_TABLE."
-            VALUES(".$cat_id.", '".$filter['type']."', '".$filter['cond']."', '".$filter['value']."');");
+          $query = '
+INSERT INTO '.CATEGORY_FILTERS_TABLE.' 
+  VALUES(
+    '.$cat_id.', 
+    "'.$filter['type'].'", 
+    "'.$filter['cond'].'", 
+    "'.$filter['value'].'"
+  )
+;';
+        pwg_query($query);
         }
       }
@@ -59 +67 @@
       
   /* select options, for html_options */
-  $template->assign('options', array(
-    'tags' => array(
-      'all' => l10n('All these tags'),
-      'one' => l10n('One of these tags'),
-      'none' => l10n('None of these tags'),
-      'only' => l10n('Only these tags'),
-      ),
-    'date' => array(
-      'the' => l10n('Added the'),
-      'before' => l10n('Added before the'),
-      'after' => l10n('Added after the'),
-      ),
-    'limit' => array('limit' => 'limit'), // second filter not used
-  ));
+  $template->assign(
+    'options', 
+    array(
+      'tags' => array(
+        'all' => l10n('All these tags'),
+        'one' => l10n('One of these tags'),
+        'none' => l10n('None of these tags'),
+        'only' => l10n('Only these tags'),
+        ),
+      'date' => array(
+        'the' => l10n('Added the'),
+        'before' => l10n('Added before the'),
+        'after' => l10n('Added after the'),
+        ),
+      'limit' => array('limit' => 'limit'), // second filter not used
+      )
+    );
   
   /* get filters for this album */
-  $filters = pwg_query("SELECT * FROM ".CATEGORY_FILTERS_TABLE." WHERE category_id = ".$cat_id." ORDER BY type ASC, cond ASC;");
+  $filters = pwg_query('SELECT * FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.' ORDER BY type ASC, cond ASC;');
   while ($filter = pwg_db_fetch_assoc($filters))
   {
@@ -81 +92 @@
     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); 
+      $query = '
+SELECT
+    id AS tag_id,
+    name AS tag_name
+  FROM '.TAGS_TABLE.'
+  WHERE id IN('.$filter['value'].')
+';
+      $filter['value'] = get_taglist($query); 
     }
     
@@ -98 +109 @@
   }
   
+  /* all tags */
+  $query = '
+SELECT
+    id AS tag_id,
+    name AS tag_name
+  FROM '.TAGS_TABLE.'
+;';
+  $tags = get_taglist($query);
+  
   /* get image number */
   if ($template->get_template_vars('IMAGE_COUNT') == null)
   {
-    list($image_num) = pwg_db_fetch_row(pwg_query("SELECT count(*) FROM ".IMAGE_CATEGORY_TABLE." WHERE category_id = ".$cat_id." AND smart = true;"));
+    list($image_num) = pwg_db_fetch_row(pwg_query('SELECT count(*) FROM '.IMAGE_CATEGORY_TABLE.' WHERE category_id = '.$cat_id.' AND smart = true;'));
     $template->assign('IMAGE_COUNT', l10n_dec('%d photo', '%d photos', $image_num));
   }
@@ -108 +128 @@
     'SMART_PATH' => SMART_PATH,
     'COUNT_SCRIPT_URL' => SMART_PATH.'include/count_images.php',
+    'tags' => $tags,
   )); 
   $template->set_prefilter('categories', 'smart_cat_modify_prefilter');