twiki% diff -c Action.pm.20020926 Action.pm
*** Action.pm.20020926  Wed Dec 11 10:30:39 2002
--- Action.pm   Mon Dec 16 15:39:55 2002
***************
*** 31,37 ****
    # Colour for an unparseable date
    $badcol = "red";
    # Colour for table header rows
!   $hdrcol = "FFCC66";
    # Border width for tables
    $border = "1";

--- 31,37 ----
    # Colour for an unparseable date
    $badcol = "red";
    # Colour for table header rows
!   $hdrcol = "#FFCC66";
    # Border width for tables
    $border = "1";

***************
*** 232,240 ****

      my $text = "<td> " . $this->{WHO} . " </td><td";
      if ( !defined($this->{DUE}) ) {
!       $text .= " bgcolor=$badcol";
      } elsif ( $this->isLate() ) {
!       $text .= " bgcolor=$latecol";
      }
      $text .= "> " . $this->dueString();
      #debug $text .= " (" . $this->daysToGo() . " days to go)";
--- 232,240 ----

      my $text = "<td> " . $this->{WHO} . " </td><td";
      if ( !defined($this->{DUE}) ) {
!       $text .= " bgcolor=\"$badcol\"";
      } elsif ( $this->isLate() ) {
!       $text .= " bgcolor=\"$latecol\"";
      }
      $text .= "> " . $this->dueString();
      #debug $text .= " (" . $this->daysToGo() . " days to go)";
***************
*** 252,262 ****
        # point that will be in the middle of a table
        my $tmp = $this->{TEXT};
        $tmp =~ s/<br ?\/?>/\n/sgo;
!       $text .= "<A name=\"$anchor\"></A> " . $tmp;
      }
      $text .= " </td><td> " . $this->{STATE} . " </td>";

!     $text .= "<td><A ";

      my $url = "%SCRIPTURLPATH%/editaction%SCRIPTSUFFIX%/" .
        $this->{WEB} . "/" . $this->{TOPIC} .
--- 252,262 ----
        # point that will be in the middle of a table
        my $tmp = $this->{TEXT};
        $tmp =~ s/<br ?\/?>/\n/sgo;
!       $text .= "<a name=\"$anchor\"></a> " . $tmp;
      }
      $text .= " </td><td> " . $this->{STATE} . " </td>";

!     $text .= "<td><a ";

      my $url = "%SCRIPTURLPATH%/editaction%SCRIPTSUFFIX%/" .
        $this->{WEB} . "/" . $this->{TOPIC} .
***************
*** 264,270 ****

      if ($newWindow) {
        # Javascript window call
!       $text .= "onClick=\"return editWindow('$url')\" ";
      }

      $text .= "href=\"$url\">edit</a></td>";
--- 264,270 ----

      if ($newWindow) {
        # Javascript window call
!       $text .= "onclick=\"return editWindow('$url')\" ";
      }

      $text .= "href=\"$url\">edit</a></td>";



twiki% diff -c ActionSet.pm.20020926 ActionSet.pm
*** ActionSet.pm.20020926       Wed Dec 11 10:30:39 2002
--- ActionSet.pm        Mon Dec 16 15:42:54 2002
***************
*** 81,88 ****
      my ( $this, $type, $newWindow ) = @_;
      my $action;

!     my $text = "<table border=$Action::border>\n" .
!       "<tr bgcolor=$Action::hdrcol><th>Assignee</th>" .
        "<th>Due date</th>" .
          "<th>Description</th>" .
            "<th>State</th><th>&nbsp;</th></tr>\n";
--- 81,88 ----
      my ( $this, $type, $newWindow ) = @_;
      my $action;

!     my $text = "<table border=\"$Action::border\">\n" .
!       "<tr bgcolor=\"$Action::hdrcol\"><th>Assignee</th>" .
        "<th>Due date</th>" .
          "<th>Description</th>" .
            "<th>State</th><th>&nbsp;</th></tr>\n";
***************
*** 197,208 ****
      my $web;
      foreach $web ( @weblist ) {
        if ( -d "$dataDir/$web" && $web =~ /^$webs$/ ) {
        $web =~ /(.*)/; # untaint
        # Exclude webs flagged as NOSEARCHALL
        my $thisWebNoSearchAll =
        TWiki::Func::getPreferencesValue( "NOSEARCHALL", $web );
!       next if ( $thisWebNoSearchAll =~ /on/i );
!       my $subacts = allActionsInWeb( $1, $attrs );
        $actions->concat( $subacts );
        }
      }
--- 197,210 ----
      my $web;
      foreach $web ( @weblist ) {
        if ( -d "$dataDir/$web" && $web =~ /^$webs$/ ) {
+       $web =~ s/$TWiki::securityFilter//go;  # FIXME: This bypasses the official API
        $web =~ /(.*)/; # untaint
+       $web = $1;
        # Exclude webs flagged as NOSEARCHALL
        my $thisWebNoSearchAll =
        TWiki::Func::getPreferencesValue( "NOSEARCHALL", $web );
!       next if ( ( $thisWebNoSearchAll =~ /on/i ) && ( $web ne $theweb ) );
!       my $subacts = allActionsInWeb( $web, $attrs );
        $actions->concat( $subacts );
        }
      }