Changeset 2655 for plugins/dcLog

Timestamp:

09/21/10 12:32:47 (13 years ago)

Author:

Tomtom33

Message:

dcLog 1.0.1:

• Handled dcLog changes (revision 3273 of Dotclear dev)
• Added Support of multiple criteria filter
• Added component filter

Location:

plugins/dcLog

Files:

• _define.php (modified) (1 diff)
• index.php (modified) (4 diffs)

plugins/dcLog/_define.php

@@ -16 +16 @@
           /* Description*/         "Displays Dotclear logs",
           /* Author */             "Tomtom (http://blog.zenstyle.fr)",
-          /* Version */            '1.0'
+          /* Version */            '1.0.1'
 );
 

plugins/dcLog/index.php

@@ -20 +20 @@
 $status        = isset($_GET['status']) ? $_GET['status'] : null;
 # filter initialisation
-$blog_id       = isset($_GET['blog_id']) ? $_GET['blog_id'] : 'all';
-$user_id       = isset($_GET['user_id']) ? $_GET['user_id'] : '';
-$table         = isset($_GET['table']) ? $_GET['table'] : '';
-$ip            = isset($_GET['ip']) ? $_GET['ip'] : '';
+$blog_id       = isset($_GET['blog_id']) ? $_GET['blog_id'] : null;
+$user_id       = isset($_GET['user_id']) ? $_GET['user_id'] : null;
+$table         = isset($_GET['table']) ? $_GET['table'] : null;
+$ip            = isset($_GET['ip']) ? $_GET['ip'] : null;
 $nb            = isset($_GET['nb']) ? $_GET['nb'] : 20;
 # form initialisation
@@ -43 +43 @@
 
 # Gets logs & prepares display object
-$params = array('blog_id' => $blog_id,'user_id' => $user_id,'log_table' => $table,'log_ip' => $ip);
+$params = array(
+     'blog_id' => $blog_id,
+     'user_id' => !is_null($user_id) && $user_id !== '' ? explode(',',$user_id) : $user_id,
+     'log_table' => !is_null($table) && $table !== '' ? explode(',',$table) : $table,
+     'log_ip' => !is_null($ip) && $ip !== '' ? explode(',',$ip) : $ip
+);
 $l_rs = $core->log->getLogs($params);
 $l_nb = $l_rs->count();
@@ -82 +87 @@
 $blogs = $core->getBlogs();
 while ($blogs->fetch()) {
-     $combo_blog[$blogs->blog_name] = $blogs->blog_id;
+     $combo_blog[sprintf('%s (%s)',$blogs->blog_name,$blogs->blog_id)] = $blogs->blog_id;
 }
 
@@ -97 +102 @@
      '<p><label>'.__('User:').
      form::field('user_id',20,50,$user_id).'</label></p>'.
+     '<p><label class="classic">'. form::field('nb',3,3,$nb).' '.
+     __('Logs per page').'</label>&nbsp;'.
+     '<input type="submit" value="'.__('filter').'" /></p>'.
      '</div><div class="col">'.
      '<p><label>'.__('IP:').
      form::field('ip',20,50,$ip).'</label></p>'.
-     '<p><label class="classic">'. form::field('nb',3,3,$nb).' '.
-     __('Logs per page').'</label><p>'.
-     '<p><input type="submit" value="'.__('filter').'" /></p>'.
+     '<p><label>'.__('Component:').
+     form::field('table',20,50,$table).'</label></p>'.
      '</div></div>'.
      '<br class="clear" />'. //Opera sucks