Changeset 1817

Timestamp:

02/14/07 23:53:02 (6 years ago)

Author:

plg

Message:

New: history logs high quality access via action.php. A new column
#history.is_high was added. Filter was added on administration history
detail view.

Modification: function get_sql_condition_FandF was slightly refactored for
presentation improvement.

Location:

trunk

Files:

• action.php (modified) (4 diffs)
• admin/history.php (modified) (7 diffs)
• admin/include/functions.php (modified) (4 diffs)
• include/functions.inc.php (modified) (3 diffs)
• include/functions_user.inc.php (modified) (2 diffs)
• install/db/51-database.php (added)
• install/phpwebgallery_structure.sql (modified) (1 diff)
• template/yoga/admin/history.tpl (modified) (3 diffs)

trunk/action.php

@@ -62 +62 @@
 
 
-if ( !isset($_GET['id']) or !is_numeric($_GET['id'])
+if (!isset($_GET['id'])
+    or !is_numeric($_GET['id'])
     or !isset($_GET['part'])
     or !in_array($_GET['part'], array('t','e','i','h') ) )
@@ -69 +70 @@
 }
 
-$id = $_GET['id'];
 $query = '
 SELECT * FROM '. IMAGES_TABLE.'
-  WHERE id='.$id.'
+  WHERE id='.$_GET['id'].'
 ;';
 
@@ -85 +85 @@
 // are not used because it's not necessary (filter <> restriction)
 $query='
-SELECT id FROM '.CATEGORIES_TABLE.'
-  INNER JOIN '.IMAGE_CATEGORY_TABLE.'
-  ON category_id=id
-  WHERE image_id='.$id.'
-'.get_sql_condition_FandF(array('forbidden_categories' => 'category_id'), 'AND').'
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+    INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON category_id = id
+  WHERE image_id = '.$_GET['id'].'
+'.get_sql_condition_FandF(
+  array('forbidden_categories' => 'category_id'),
+  '    AND'
+  ).'
   LIMIT 1
 ;';
@@ -124 +127 @@
 }
 
+if ($_GET['part'] == 'h') {
+  $is_high = true;
+  pwg_log($_GET['id'], $is_high);
+}
+
 $http_headers = array();
 

trunk/admin/history.php

@@ -95 +95 @@
   }
 
+  $search['fields']['pictures'] = $_POST['pictures'];
+  $search['fields']['high'] = $_POST['high'];
+  
   // echo '<pre>'; print_r($search); echo '</pre>';
   
@@ -182 +185 @@
   }
 
+  if (isset($page['search']['fields']['pictures']))
+  {
+    $clause = null;
+    
+    if ($page['search']['fields']['pictures'] == 'no')
+    {
+      $clause = 'image_id IS NULL';
+    }
+
+    if ($page['search']['fields']['pictures'] == 'only')
+    {
+      $clause = 'image_id IS NOT NULL';
+    }
+
+    if (isset($clause))
+    {
+      array_push($clauses, $clause);
+    }
+  }
+
+  if (isset($page['search']['fields']['high']))
+  {
+    $clause = null;
+    
+    if ($page['search']['fields']['high'] == 'no')
+    {
+      $clause = "is_high IS NULL or is_high = 'false'";
+    }
+
+    if ($page['search']['fields']['high'] == 'only')
+    {
+      $clause = "is_high = 'true'";
+    }
+
+    if (isset($clause))
+    {
+      array_push($clauses, $clause);
+    }
+  }
+  
   $clauses = prepend_append_array_items($clauses, '(', ')');
 
@@ -199 +242 @@
 
   $query = '
-SELECT date, time, user_id, IP, section, category_id, tag_ids, image_id
+SELECT
+    date,
+    time,
+    user_id,
+    IP,
+    section,
+    category_id,
+    tag_ids,
+    image_id,
+    is_high
   FROM '.HISTORY_TABLE.'
   WHERE '.$where_separator.'
@@ -299 +351 @@
         )
       );
+
+    if (isset($line['image_id']))
+    {
+      if ($line['is_high'] == 'true')
+      {
+        $template->assign_block_vars('detail.high', array());
+      }
+      else
+      {
+        $template->assign_block_vars('detail.no_high', array());
+      }
+    }
   }
 }
@@ -352 +416 @@
   {
     $tokens = explode('-', $page['search']['fields']['date-before']);
-    
-     (int)$tokens[0];
-     (int)$tokens[1];
-     (int)$tokens[2];
-  }
+
+    $form['end_year']  = (int)$tokens[0];
+    $form['end_month'] = (int)$tokens[1];
+    $form['end_day']   = (int)$tokens[2];
+  }
+
+  $form['pictures'] = $page['search']['fields']['pictures'];
+  $form['high'] = $page['search']['fields']['high'];
 }
 else
@@ -365 +432 @@
   $form['start_month'] = $form['end_month'] = date('n');
   $form['start_day']   = $form['end_day']   = date('j');
+  $form['pictures'] = 'yes';
+  $form['high'] = 'yes';
 }
 
@@ -380 +449 @@
     )
   );
+
+foreach (array('pictures', 'high') as $block)
+{
+  foreach (array('yes', 'no', 'only') as $item)
+  {
+    $selected = '';
+    
+    if ($item == $form[$block])
+    {
+      $selected = 'selected="selected"';
+    }
+    
+    $template->assign_block_vars(
+      $block.'_option',
+      array(
+        'VALUE' => $item,
+        'CONTENT' => l10n($item),
+        'SELECTED' => $selected,
+        )
+      );
+  }
+}
   
 // +-----------------------------------------------------------------------+

trunk/admin/include/functions.php

@@ -607 +607 @@
     SET ';
         $is_first = true;
-        foreach ($dbfields['update'] as $num => $key)
+        foreach ($dbfields['update'] as $key)
         {
           if (!$is_first)
@@ -626 +626 @@
         $query.= '
     WHERE ';
-        foreach ($dbfields['primary'] as $num => $key)
+
+        $is_first = true;
+        foreach ($dbfields['primary'] as $key)
         {
-          if ($num > 1)
+          if (!$is_first)
           {
             $query.= ' AND ';
           }
           $query.= $key.' = \''.$data[$key].'\'';
+          $is_first = false;
         }
         $query.= '
@@ -1903 +1906 @@
 
 /**
+ * Create an XML file with PhpWebGallery informations about a list of
+ * pictures.
+ *
+ * The goal of the export feature is to make easier the reading of
+ * informations related to pictures outside of PhpWebGallery.
+ *
+ * @param array image_ids
+ */
+function export_pwg_data($image_ids)
+{
+  global $conf;
+
+  if (count($image_ids) == 0)
+  {
+    return;
+  }
+
+  $fp = fopen($conf['export_file'], 'w');
+  $xml_string = '<export>'."\n";
+
+  $query = '
+SELECT tag_id,
+       image_id
+  FROM '.IMAGE_TAG_TABLE.'
+  WHERE image_id IN ('.implode(',', $image_ids).')
+;';
+  $result = pwg_query($query);
+  $tags_of = array();
+  $all_tag_ids = array();
+  $tag_name_of = array();
+
+  if (mysql_num_rows($result))
+  {
+      while ($row = mysql_fetch_array($result))
+      {
+        array_push($all_tag_ids, $row['tag_id']);
+        
+        if (!isset($tags_of[ $row['image_id'] ])) {
+          $tags_of[ $row['image_id'] ] = array();
+        }
+        
+        array_push(
+          $tags_of[ $row['image_id'] ],
+          $row['tag_id']
+          );
+      }
+
+      $all_tag_ids = array_unique($all_tag_ids);
+
+      $query = '
+SELECT id,
+       name
+  FROM '.TAGS_TABLE.'
+  WHERE id IN ('.implode(',', $all_tag_ids).')
+;';
+      $result = pwg_query($query);
+
+      while ($row = mysql_fetch_array($result))
+      {
+        $tag_name_of[ $row['id'] ] = $row['name'];
+      }
+  }
+
+  $query = '
+SELECT id,
+       path
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN ('.implode(',', $image_ids).')
+;';
+  $result = pwg_query($query);
+
+  while ($row = mysql_fetch_array($result))
+  {
+    $xml_string.= "  <photo>\n";
+    $xml_string.= "    <id>".$row['id']."</id>\n";
+    $xml_string.= "    <path>".$row['path']."</path>\n";
+
+    foreach ($tags_of[ $row['id'] ] as $tag_id)
+    {
+      $xml_string.= "    <tag>".$tag_name_of[$tag_id]."</tag>\n";
+    }
+    
+    $xml_string.= "  </photo>\n";
+  }
+  
+  $xml_string.= '</export>';
+  fwrite($fp, $xml_string);
+  fclose($fp);
+}
+
+/**
  * Check configuration and add notes on problem
  *
@@ -1938 +2032 @@
   }
 }
-
 /**
  * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain)

trunk/include/functions.inc.php

@@ -411 +411 @@
 }
 
-function pwg_log($image_id = null)
+function pwg_log($image_id = null, $is_high = false)
 {
   global $conf, $user, $page;
@@ -469 +469 @@
     category_id,
     image_id,
+    is_high,
     tag_ids
   )
@@ -484 +485 @@
     '.(isset($page['category']) ? $page['category'] : 'NULL').',
     '.(isset($image_id) ? $image_id : 'NULL').',
+    '.(isset($image_id) ? "'".boolean_to_string($is_high)."'" : 'NULL').',
     '.(isset($tags_string) ? "'".$tags_string."'" : 'NULL').'
   )

trunk/include/functions_user.inc.php

@@ -1090 +1090 @@
 
 /*
- * Compute sql where condition with restrict and filter data
- *
- * FandF: Forbidden and Filters
- *
- * @param $condition_fields array: 
- *            keys are condition to aply and 
- *            values are sql field to use
- *            array('forbidden_categories' => 'ic.category_id')
- *        $prefix_condition string:
- *            this value are concatenated if sql is not empty
- *        $force_one_condition:
- *            if there are not condition , use this condition "1 = 1"
+ * Compute sql where condition with restrict and filter data. "FandF" means
+ * Forbidden and Filters.
+ *
+ * @param array condition_fields: read function body
+ * @param string prefix_condition: prefixes sql if condition is not empty
+ * @param boolean force_one_condition: use at least "1 = 1"
  *
  * @return string sql where/conditions
  */
-function get_sql_condition_FandF($condition_fields, $prefix_condition = null, $force_one_condition = false)
+function get_sql_condition_FandF(
+  $condition_fields,
+  $prefix_condition = null,
+  $force_one_condition = false
+  )
 {
   global $user, $filter;
@@ -1116 +1114 @@
     {
       case 'forbidden_categories':
+      {
         if (!empty($user['forbidden_categories']))
         {
-          $sql_list[] = $field_name.' NOT IN ('.$user['forbidden_categories'].')';
+          $sql_list[] =
+            $field_name.' NOT IN ('.$user['forbidden_categories'].')';
         }
         break;
-
+      }
       case 'visible_categories':
+      {
         if (!empty($filter['visible_categories']))
         {
-          $sql_list[] = $field_name.' IN ('.$filter['visible_categories'].')';
+          $sql_list[] =
+            $field_name.' IN ('.$filter['visible_categories'].')';
         }
         break;
-
+      }
       case 'visible_images':
+      {
         if (!empty($filter['visible_images']))
         {
-          $sql_list[] = $field_name.' IN ('.$filter['visible_images'].')';
+          $sql_list[] =
+            $field_name.' IN ('.$filter['visible_images'].')';
         }
         break;
-
+      }
       default:
+      {
         die('Unknow condition');
         break;
-
+      }
     }
   }

trunk/install/phpwebgallery_structure.sql

@@ -127 +127 @@
   `image_id` mediumint(8) default NULL,
   `summarized` enum('true','false') default 'false',
+  `is_high` enum('true','false') default NULL,
   PRIMARY KEY  (`id`),
   KEY `history_i1` (`summarized`)

trunk/template/yoga/admin/history.tpl

@@ -50 +50 @@
   </ul>
 
+  <ul>
+    <li><label></label></li>
+    <li></li>
+  </ul>
+
+  <label>
+    {lang:Pictures}
+    <select name="pictures">
+      <!-- BEGIN pictures_option -->
+      <option
+        value="{pictures_option.VALUE}"
+        {pictures_option.SELECTED}
+      >
+        {pictures_option.CONTENT}
+      </option>
+      <!-- END pictures_option -->
+    </select>
+  </label>
+
+  <label>
+    {lang:High quality}
+    <select name="high">
+      <!-- BEGIN high_option -->
+      <option
+        value="{high_option.VALUE}"
+        {high_option.SELECTED}
+      >
+        {high_option.CONTENT}
+      </option>
+      <!-- END high_option -->
+    </select>
+  </label>
+
   <input class="submit" type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED}/>
 </fieldset>
@@ -69 +102 @@
     <th>{lang:IP}</th>
     <th>{lang:image}</th>
+    <th>{lang:high quality}</th>
     <th>{lang:section}</th>
     <th>{lang:category}</th>
@@ -80 +114 @@
     <td>{detail.IP}</td>
     <td>{detail.IMAGE}</td>
+    <td>
+  <!-- BEGIN high -->
+      <img src="{themeconf:icon_dir}/check.png" alt="{lang:yes}">
+  <!-- END high -->
+  <!-- BEGIN no_high -->
+      <img src="{themeconf:icon_dir}/uncheck.png" alt="{lang:no}">
+  <!-- END no_high -->
+    </td>
     <td>{detail.SECTION}</td>
     <td>{detail.CATEGORY}</td>