Changeset 14688

Timestamp:

May 2, 2012, 10:24:28 PM (13 years ago)

Author:

rvelices

Message:

feature 2601: Allow searching by ip in admin history
also remove php warnings when tags zere deleted after visits

Location:

trunk/admin

Files:

• history.php (modified) (8 diffs)
• include/functions_history.inc.php (modified) (1 diff)
• themes/default/template/history.tpl (modified) (1 diff)

trunk/admin/history.php

@@ -119 +119 @@
   }
 
+  if (!empty($_POST['ip']))
+  {
+    $search['fields']['ip'] = str_replace(
+      '*',
+      '%',
+      pwg_db_real_escape_string($_POST['ip'])
+      );
+  }
+
   $search['fields']['display_thumbnail'] = $_POST['display_thumbnail'];
   // Display choise are also save to one cookie
@@ -130 +139 @@
     $cookie_val = null;
   }
-  
+
   pwg_set_cookie_var('display_thumbnail', $cookie_val, strtotime('+1 month') );
 
@@ -227 +236 @@
   $category_ids = array();
   $image_ids = array();
-  $tag_ids = array();
+  $has_tags = false;
 
   foreach ($data as $row)
@@ -245 +254 @@
     if (isset($row['tag_ids']))
     {
-      foreach (explode(',', $row['tag_ids']) as $tag_id)
-      {
-        array_push($tag_ids, $tag_id);
-      }
-    }
-
-    array_push(
-      $history_lines,
-      $row
-      );
+      $has_tags = true;
+    }
+
+    $history_lines[] = $row;
   }
 
@@ -339 +342 @@
   }
 
-  if (count($tag_ids) > 0)
-  {
-    $tag_ids = array_unique($tag_ids);
-
+  if ($has_tags > 0)
+  {
     $query = '
 SELECT
     id,
     name
-  FROM '.TAGS_TABLE.'
-  WHERE id IN ('.implode(', ', $tag_ids).')
-;';
-    $name_of_tag = array();
-
-    $result = pwg_query($query);
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $name_of_tag[ $row['id'] ] = $row['name'];
-    }
+  FROM '.TAGS_TABLE;
+    $name_of_tag = simple_hash_from_query($query, 'id', 'name');
   }
 
@@ -431 +424 @@
       $tags_string = preg_replace(
         '/(\d+)/e',
-        '$name_of_tag["$1"]',
+        'isset($name_of_tag["$1"]) ? $name_of_tag["$1"] : "$1"',
         str_replace(
           ',',
@@ -631 +624 @@
   $form['image_id'] = @$page['search']['fields']['image_id'];
   $form['filename'] = @$page['search']['fields']['filename'];
+  $form['ip'] = @$page['search']['fields']['ip'];
 
   $form['display_thumbnail'] = @$page['search']['fields']['display_thumbnail'];
@@ -656 +650 @@
     'IMAGE_ID' => @$form['image_id'],
     'FILENAME' => @$form['filename'],
+    'IP' => @$form['ip'],
 
     'month_list' => $month_list,

trunk/admin/include/functions_history.inc.php

@@ -138 +138 @@
     }
   }
+
+  if (isset($search['fields']['ip']))
+  {
+    $clauses[] = 'IP LIKE "'.$search['fields']['ip'].'"';
+  }
   
   $clauses = prepend_append_array_items($clauses, '(', ')');

trunk/admin/themes/default/template/history.tpl

@@ -69 +69 @@
   <label>
     {'File name'|@translate}
-    <input name="filename" value="{$FILENAME}" type="text">
+                <input name="filename" value="{$FILENAME}" type="text" size="12">
   </label>
+
+        <label>
+                {'IP'|@translate}
+                <input name="ip" value="{$IP}" type="text" size="12">
+        </label>
 
   <label>