Changeset 70

Timestamp:

04/01/05 12:38:16

Author:

tobias

Message:

Added log menu item and reset spamlookup logs functionality

Files:

• trunk/plugins/spamlookup/mt-spamlookup.cgi (modified) (3 diffs)
• trunk/plugins/spamlookup/tmpl/logs.tmpl (added)
• trunk/plugins/spamlookup/tmpl/slheader.tmpl (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)

trunk/plugins/spamlookup/mt-spamlookup.cgi

@@ -59 +59 @@
-        view => \&view,
-        domains => \&domains,
-
+
+
+
-    $app->{default_mode} = 'default';
-    my $mode = $app->{query}->param('__mode');
@@ -70 +72 @@
-                              bc_uri => '?__mode=show' } ];
-    $app->{mode} = $mode;
-   
+
-}
-
@@ -715 +717 @@
-}
-
+sub logs {
+    my $app = shift;
+    my (%param) = @_;
+
+    die $app->error("You have no permissions to view the SpamLookup logs.")
+        unless $app->{author}->can_view_log;
+
+    $app->add_breadcrumb('Logs');
+    $param{nav_logs} = 1;
+
+    my $query = $app->{query};
+    my $data = MT::Plugin::SpamLookup->instance->get_config_hash();
+    my $service=$data->{cache_ip_infoservice};
+    undef($service) unless($service =~ /%ip%/);
+    my $prefix = qq{SpamLookup returned error:};
+
+    require MT::Log;
+    if($app->{mode} eq 'logs') {
+        # this comes partially from MT::App::CMS
+        my @log;
+        my $iter = MT::Log->load_iter(undef, { 'sort' => 'created_on' });
+        my $i = 1;
+        while (my $log = $iter->()) {
+            # find SpamLookup's messages
+            my $msg=$log->message;
+            next unless ($msg && $msg =~ s{^\Q$prefix\E\s*}{});
+            my $ip=$log->ip;
+            if(defined($service)) {
+                my $dest = $service;
+                $dest =~ s/%ip%/$ip/eg;
+                $ip=qq{<a href="$dest">$ip</a>};
+            }
+            push(@log,{
+                       log_date => MT::Util::format_ts("%Y.%m.%d %H:%M:%S", $log->created_on),
+                       log_ip => $ip,
+                       log_message => $msg,
+                       is_odd => $i++ % 2 ? 1 : 0,
+                      });
+        }
+        $param{log_entries}=scalar(@log);
+        $param{log_entry_loop}=\@log;
+    } else {
+        my @remove;
+        my $iter = MT::Log->load_iter(undef);
+        while (my $log = $iter->()) {
+            # find SpamLookup's messages
+            my $msg=$log->message;
+            next unless ($msg && $msg =~ m{^\Q$prefix\E});
+            push(@remove,$log);
+        }
+        $param{log_entries}=0;
+        $param{log_reset}=scalar(@remove);
+        foreach my $log (@remove) {
+            $log->remove;
+        }
+    }
+    $app->build_page('logs.tmpl', \%param);
+}
+
-sub show_form {
-    my $app = shift;

trunk/plugins/spamlookup/tmpl/slheader.tmpl

@@ -99 +99 @@
-.sub a#nav-despam-pings { background-image: url(<TMPL_VAR NAME=STATIC_URI>images/nav-search.gif); }
-.sub a#nav-test { background-image: url(<TMPL_VAR NAME=STATIC_URI>images/nav-view-site.gif); }
+.sub a#nav-logs { background-image: url(<TMPL_VAR NAME=STATIC_URI>images/nav-import.gif); }
-
-.panel {
@@ -199 +200 @@
-<ul class="sub">
-<li><a<TMPL_IF NAME=NAV_TEST> class="here"</TMPL_IF> id="nav-test" title="<MT_TRANS phrase="Test Filters">" href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=test"><MT_TRANS phrase="Test"></a></li>
+<li><a<TMPL_IF NAME=NAV_LOGS> class="here"</TMPL_IF> id="nav-logs" title="<MT_TRANS phrase="SpamLookup Logs">" href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=logs"><MT_TRANS phrase="Logs"></a></li>
-</ul>
-</li>

trunk/readme.txt

@@ -39 +39 @@
-                              config.tmpl
-                              despam.tmpl
+                              logs.tmpl
-                              pings.tmpl
-                              slfooter.tmpl